]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
perf script: Fix memory leaks in list_scripts()
authorGustavo A. R. Silva <gustavo@embeddedor.com>
Mon, 8 Apr 2019 16:27:48 +0000 (11:27 -0500)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 26 Aug 2019 14:58:30 +0000 (11:58 -0300)
In case memory resources for *buf* and *paths* were allocated, jump to
*out* and release them before return.

Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Gustavo A. R. Silva <gustavo@embeddedor.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Addresses-Coverity-ID: 1444328 ("Resource leak")
Fixes: 6f3da20e151f ("perf report: Support builtin perf script in scripts menu")
Link: http://lkml.kernel.org/r/20190408162748.GA21008@embeddedor
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/ui/browsers/scripts.c

index f2fd9f0d7ab5e6de06954cb7751db4c4ed4bcb71..50e0c03171f21087d17bb3e5a03a5ac5bb3cfbfb 100644 (file)
@@ -133,8 +133,10 @@ static int list_scripts(char *script_name, bool *custom,
                int key = ui_browser__input_window("perf script command",
                                "Enter perf script command line (without perf script prefix)",
                                script_args, "", 0);
-               if (key != K_ENTER)
-                       return -1;
+               if (key != K_ENTER) {
+                       ret = -1;
+                       goto out;
+               }
                sprintf(script_name, "%s script %s", perf, script_args);
        } else if (choice < num + max_std) {
                strcpy(script_name, paths[choice]);