From: Li Zefan <lizf@cn.fujitsu.com>
To: Ingo Molnar <mingo@elte.hu>
Cc: Frederic Weisbecker <fweisbec@gmail.com>,
Steven Rostedt <rostedt@goodmis.org>,
Tom Zanussi <tzanussi@gmail.com>,
Masami Hiramatsu <mhiramat@redhat.com>,
LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH] tracing/filters: Defer pred allocation, fix memory leak
Date: Tue, 01 Sep 2009 13:31:38 +0800 [thread overview]
Message-ID: <4A9CB1BA.3060402@cn.fujitsu.com> (raw)
In-Reply-To: <20090831174107.GB6048@nowhere>
Check if we have already allocated memory for filter preds.
Spotted-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
kernel/trace/trace_events_filter.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
index c6b2edf..93660fb 100644
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -409,6 +409,9 @@ static int init_preds(struct ftrace_event_call *call)
struct filter_pred *pred;
int i;
+ if (call->filter)
+ return 0;
+
filter = call->filter = kzalloc(sizeof(*filter), GFP_KERNEL);
if (!call->filter)
return -ENOMEM;
@@ -447,11 +450,9 @@ static int init_subsystem_preds(struct event_subsystem *system)
if (strcmp(call->system, system->name) != 0)
continue;
- if (!call->filter) {
- err = init_preds(call);
- if (err)
- return err;
- }
+ err = init_preds(call);
+ if (err)
+ return err;
}
return 0;
--
1.6.3
next prev parent reply other threads:[~2009-09-01 5:32 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-31 8:49 [PATCH] tracing/filters: Defer pred allocation Li Zefan
2009-08-31 8:59 ` Ingo Molnar
2009-08-31 9:06 ` Li Zefan
2009-09-01 12:58 ` Masami Hiramatsu
2009-08-31 9:00 ` [tip:tracing/core] " tip-bot for Li Zefan
2009-08-31 17:41 ` [PATCH] " Frederic Weisbecker
2009-09-01 0:50 ` Li Zefan
2009-09-01 5:31 ` Li Zefan [this message]
2009-09-01 9:32 ` [PATCH] tracing/filters: Defer pred allocation, fix memory leak Frederic Weisbecker
2009-09-06 4:36 ` [tip:tracing/core] " tip-bot for Li Zefan
2009-09-01 3:28 ` [PATCH] tracing/filters: Defer pred allocation Tom Zanussi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4A9CB1BA.3060402@cn.fujitsu.com \
--to=lizf@cn.fujitsu.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mhiramat@redhat.com \
--cc=mingo@elte.hu \
--cc=rostedt@goodmis.org \
--cc=tzanussi@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox