lkml.org 
[lkml]   [2009]   [Mar]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH] tracing: fix leak in event_format_read()
From
Date
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@gmail.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




\
 
 \ /
  Last update: 2009-03-17 07:23    [W:0.156 / U:0.152 seconds]
©2003-2011 Jasper Spaans. Advertise on this site