[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1237270859.8033.141.camel@charm-linux>
Date: Tue, 17 Mar 2009 01:20:59 -0500
From: Tom Zanussi <tzanussi@...il.com>
To: linux-kernel <linux-kernel@...r.kernel.org>
Cc: Ingo Molnar <mingo@...e.hu>, Steven Rostedt <rostedt@...dmis.org>,
Frédéric Weisbecker <fweisbec@...il.com>
Subject: [PATCH] tracing: fix leak in event_format_read()
If event_format_read() exits early due to nonzero ppos, the previously
kmalloc doesn't get freed - might as well do the check before the
kmalloc and avoid the problem.
Signed-off-by: Tom Zanussi <tzanussi@...il.com>
---
kernel/trace/trace_events.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 238ea95..c88227b 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -378,15 +378,15 @@ event_format_read(struct file *filp, char __user *ubuf, size_t cnt,
char *buf;
int r;
+ if (*ppos)
+ return 0;
+
s = kmalloc(sizeof(*s), GFP_KERNEL);
if (!s)
return -ENOMEM;
trace_seq_init(s);
- if (*ppos)
- return 0;
-
/* If any of the first writes fail, so will the show_format. */
trace_seq_printf(s, "name: %s\n", call->name);
--
1.5.6.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists