[tip:perf/urgent] tools lib traceevent: Fix memory leak in pretty_print()

From: tip-bot for Steven Rostedt
Date: Wed Apr 23 2014 - 09:14:51 EST


Commit-ID: de04f8657de9d3351a2d5880f1f7080b23b798cf
Gitweb: http://git.kernel.org/tip/de04f8657de9d3351a2d5880f1f7080b23b798cf
Author: Steven Rostedt <rostedt@xxxxxxxxxxx>
AuthorDate: Tue, 22 Apr 2014 19:23:30 -0400
Committer: Jiri Olsa <jolsa@xxxxxxxxxx>
CommitDate: Wed, 23 Apr 2014 13:19:30 +0200

tools lib traceevent: Fix memory leak in pretty_print()

Commit 12e55569a244 "tools lib traceevent: Use helper trace-seq in print
functions like kernel does" added a extra trace_seq helper to process
string arguments like the kernel does it. But the difference between the
kernel and the userspace library is that the kernel's trace_seq structure
has a static allocated buffer. The userspace one has a dynamically
allocated one. It requires a trace_seq_destroy(), otherwise it produces
a nasty memory leak.

Cc: stable@xxxxxxxxxxxxxxx # 3.14+
Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
Link: http://lkml.kernel.org/r/20140422192330.6bb09bf8@xxxxxxxxxxxxxxxxxx
Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
---
tools/lib/traceevent/event-parse.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index baec7d8..b83184f 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -4344,6 +4344,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event
format, len_arg, arg);
trace_seq_terminate(&p);
trace_seq_puts(s, p.buffer);
+ trace_seq_destroy(&p);
arg = arg->next;
break;
default:
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/