Commit 6d29ae49 authored by Martin Kepplinger's avatar Martin Kepplinger Committed by Greg Kroah-Hartman

perf tools: Fix leaking rec_argv in error cases


[ Upstream commit c896f85a ]

Let's free the allocated rec_argv in case we return early, in order to
avoid leaking memory.

This adds free() at a few very similar places across the tree where it
was missing.
Signed-off-by: default avatarMartin Kepplinger <martink@posteo.de>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Martin kepplinger <martink@posteo.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20170913191419.29806-1-martink@posteo.deSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cf33c88d
...@@ -2733,6 +2733,7 @@ static int perf_c2c__record(int argc, const char **argv) ...@@ -2733,6 +2733,7 @@ static int perf_c2c__record(int argc, const char **argv)
if (!perf_mem_events[j].supported) { if (!perf_mem_events[j].supported) {
pr_err("failed: event '%s' not supported\n", pr_err("failed: event '%s' not supported\n",
perf_mem_events[j].name); perf_mem_events[j].name);
free(rec_argv);
return -1; return -1;
} }
......
...@@ -113,6 +113,7 @@ static int __cmd_record(int argc, const char **argv, struct perf_mem *mem) ...@@ -113,6 +113,7 @@ static int __cmd_record(int argc, const char **argv, struct perf_mem *mem)
if (!perf_mem_events[j].supported) { if (!perf_mem_events[j].supported) {
pr_err("failed: event '%s' not supported\n", pr_err("failed: event '%s' not supported\n",
perf_mem_events__name(j)); perf_mem_events__name(j));
free(rec_argv);
return -1; return -1;
} }
......
...@@ -1732,8 +1732,10 @@ static int timechart__io_record(int argc, const char **argv) ...@@ -1732,8 +1732,10 @@ static int timechart__io_record(int argc, const char **argv)
if (rec_argv == NULL) if (rec_argv == NULL)
return -ENOMEM; return -ENOMEM;
if (asprintf(&filter, "common_pid != %d", getpid()) < 0) if (asprintf(&filter, "common_pid != %d", getpid()) < 0) {
free(rec_argv);
return -ENOMEM; return -ENOMEM;
}
p = rec_argv; p = rec_argv;
for (i = 0; i < common_args_nr; i++) for (i = 0; i < common_args_nr; i++)
......
...@@ -2086,6 +2086,7 @@ static int trace__record(struct trace *trace, int argc, const char **argv) ...@@ -2086,6 +2086,7 @@ static int trace__record(struct trace *trace, int argc, const char **argv)
rec_argv[j++] = "syscalls:sys_enter,syscalls:sys_exit"; rec_argv[j++] = "syscalls:sys_enter,syscalls:sys_exit";
else { else {
pr_err("Neither raw_syscalls nor syscalls events exist.\n"); pr_err("Neither raw_syscalls nor syscalls events exist.\n");
free(rec_argv);
return -1; return -1;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment