Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d29ae49 authored Sep 13, 2017 by Martin Kepplinger Committed by Greg Kroah-Hartman Dec 10, 2017

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: Martin 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.de


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent cf33c88d

tools/perf/builtin-c2c.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -2733,6 +2733,7 @@ static int perf_c2c__record(int argc, const char **argv)
		if (!perf_mem_events[j].supported) {
		pr_err("failed: event '%s' not supported\n",
		perf_mem_events[j].name);
		free(rec_argv);
		return -1;
		}

tools/perf/builtin-mem.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -113,6 +113,7 @@ static int __cmd_record(int argc, const char *argv, struct perf_mem mem)
		if (!perf_mem_events[j].supported) {
		pr_err("failed: event '%s' not supported\n",
		perf_mem_events__name(j));
		free(rec_argv);
		return -1;
		}

tools/perf/builtin-timechart.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1732,8 +1732,10 @@ static int timechart__io_record(int argc, const char **argv)
		if (rec_argv == NULL)
		return -ENOMEM;

		if (asprintf(&filter, "common_pid != %d", getpid()) < 0)
		if (asprintf(&filter, "common_pid != %d", getpid()) < 0) {
		free(rec_argv);
		return -ENOMEM;
		}

		p = rec_argv;
		for (i = 0; i < common_args_nr; i++)

tools/perf/builtin-trace.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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";
		else {
		pr_err("Neither raw_syscalls nor syscalls events exist.\n");
		free(rec_argv);
		return -1;
		}
		}