summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorNamhyung Kim <namhyung@kernel.org>2014-03-17 10:45:49 +0900
committerArnaldo Carvalho de Melo <acme@redhat.com>2014-03-18 18:17:01 -0300
commit574799bfdbc3a13e0b5e2f6af34b761bde743a9a (patch)
treeba56c148f77f645414ff46f2d86d111415372874 /tools
parent11c9abf2270793bd1c1b8828edb4223f8010e56c (diff)
downloadop-kernel-dev-574799bfdbc3a13e0b5e2f6af34b761bde743a9a.zip
op-kernel-dev-574799bfdbc3a13e0b5e2f6af34b761bde743a9a.tar.gz
perf tools: Fix memory leak when synthesizing thread records
Checking default guest machine should be done before allocating event structures otherwise it'll leak memory. Signed-off-by: Namhyung Kim <namhyung@kernel.org> Cc: Don Zickus <dzickus@redhat.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Joe Mario <jmario@redhat.com> Link: http://lkml.kernel.org/r/87ob15tx6a.fsf@sejong.aot.lge.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/util/event.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index ebb48a6..9d12aa6 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -446,6 +446,9 @@ int perf_event__synthesize_threads(struct perf_tool *tool,
union perf_event *comm_event, *mmap_event, *fork_event;
int err = -1;
+ if (machine__is_default_guest(machine))
+ return 0;
+
comm_event = malloc(sizeof(comm_event->comm) + machine->id_hdr_size);
if (comm_event == NULL)
goto out;
@@ -458,9 +461,6 @@ int perf_event__synthesize_threads(struct perf_tool *tool,
if (fork_event == NULL)
goto out_free_mmap;
- if (machine__is_default_guest(machine))
- return 0;
-
snprintf(proc_path, sizeof(proc_path), "%s/proc", machine->root_dir);
proc = opendir(proc_path);
OpenPOWER on IntegriCloud