aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace_events.c
diff options
context:
space:
mode:
authorTom Zanussi <tzanussi@gmail.com>2009-03-17 02:20:59 -0400
committerIngo Molnar <mingo@elte.hu>2009-03-17 03:38:23 -0400
commitc269fc8c537d761f36cb98e637ae934d9331a9d5 (patch)
treef354c1ea46d796d553e239cf6365dd92c2200182 /kernel/trace/trace_events.c
parente4106133341121aeaad732d4613de06d9033b5ac (diff)
tracing: fix leak in event_format_read()
Impact: fix memory leak If event_format_read() exits early due to nonzero ppos, the previous kmalloc doesn't get freed - might as well do the check before the kmalloc and avoid the problem. Signed-off-by: Tom Zanussi <tzanussi@gmail.com> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: =?ISO-8859-1?Q?Fr=E9d=E9ric?= Weisbecker <fweisbec@gmail.com> LKML-Reference: <1237270859.8033.141.camel@charm-linux> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace/trace_events.c')
-rw-r--r--kernel/trace/trace_events.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 238ea95a4115..c88227b3b9db 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,
378 char *buf; 378 char *buf;
379 int r; 379 int r;
380 380
381 if (*ppos)
382 return 0;
383
381 s = kmalloc(sizeof(*s), GFP_KERNEL); 384 s = kmalloc(sizeof(*s), GFP_KERNEL);
382 if (!s) 385 if (!s)
383 return -ENOMEM; 386 return -ENOMEM;
384 387
385 trace_seq_init(s); 388 trace_seq_init(s);
386 389
387 if (*ppos)
388 return 0;
389
390 /* If any of the first writes fail, so will the show_format. */ 390 /* If any of the first writes fail, so will the show_format. */
391 391
392 trace_seq_printf(s, "name: %s\n", call->name); 392 trace_seq_printf(s, "name: %s\n", call->name);