summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorChangbin Du <changbin.du@gmail.com>2019-03-16 16:05:48 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-04-20 09:15:57 +0200
commitbb644ded9e6d44283a3df3e2902c2b211c67b728 (patch)
tree54bef131a28439a7654daa59fe6824c5a3cae3ed /tools
parentdf894a047f372dac1251d96d8e8ea5dd7c697856 (diff)
downloadlinux-stable-bb644ded9e6d44283a3df3e2902c2b211c67b728.tar.gz
linux-stable-bb644ded9e6d44283a3df3e2902c2b211c67b728.tar.bz2
linux-stable-bb644ded9e6d44283a3df3e2902c2b211c67b728.zip
perf top: Fix error handling in cmd_top()
[ Upstream commit 70c819e4bf1c5f492768b399d898d458ccdad2b6 ] We should go to the cleanup path, to avoid leaks, detected using gcc's ASan. Signed-off-by: Changbin Du <changbin.du@gmail.com> Reviewed-by: Jiri Olsa <jolsa@kernel.org> Cc: Alexei Starovoitov <ast@kernel.org> Cc: Daniel Borkmann <daniel@iogearbox.net> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Steven Rostedt (VMware) <rostedt@goodmis.org> Link: http://lkml.kernel.org/r/20190316080556.3075-9-changbin.du@gmail.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/builtin-top.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index d21d8751e749..33eefc33e0ea 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -1491,8 +1491,9 @@ int cmd_top(int argc, const char **argv)
annotation_config__init();
symbol_conf.try_vmlinux_path = (symbol_conf.vmlinux_name == NULL);
- if (symbol__init(NULL) < 0)
- return -1;
+ status = symbol__init(NULL);
+ if (status < 0)
+ goto out_delete_evlist;
sort__setup_elide(stdout);