perf tools: Fix leaking rec_argv in error cases

[ Upstream commit c896f85a7c15ab9d040ffac8b8003e47996602a2 ]

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>

diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c
index fd32ad08c6d47d42f962f763877d7e0c4c1b7fa8..d00aac51130dae9c1b5a706a1d8323b5eba52af9 100644 (file)
--- a/tools/perf/builtin-c2c.c
+++ b/tools/perf/builtin-c2c.c
@@ -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;
                }
 

diff --git a/tools/perf/builtin-mem.c b/tools/perf/builtin-mem.c
index 4db960085273064d8ee0e1ceca7a1ac3929150c4..e15efba605f6d5af7d34ac41e9d30b3d93b484eb 100644 (file)
--- a/tools/perf/builtin-mem.c
+++ b/tools/perf/builtin-mem.c
@@ -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;
                }
 

diff --git a/tools/perf/builtin-timechart.c b/tools/perf/builtin-timechart.c
index 4e2e61695986350a93b04b322712267068974e9e..01de01ca14f2025d943422732af5a38badfef1c5 100644 (file)
--- a/tools/perf/builtin-timechart.c
+++ b/tools/perf/builtin-timechart.c
@@ -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++)

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index d5d7fff1c211ca809db3c6adce0420be0a34e929..8e3c4ec00017dd51feb91ff85786d046361b35e1 100644 (file)
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -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;
                }
        }