Skip to content

Commit f002387

Browse files
changbindugregkh
authored andcommitted
perf top: Fix error handling in cmd_top()
[ Upstream commit 70c819e ] 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>
1 parent 63e03ef commit f002387

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

tools/perf/builtin-top.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1320,8 +1320,9 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)
13201320
symbol_conf.priv_size = sizeof(struct annotation);
13211321

13221322
symbol_conf.try_vmlinux_path = (symbol_conf.vmlinux_name == NULL);
1323-
if (symbol__init(NULL) < 0)
1324-
return -1;
1323+
status = symbol__init(NULL);
1324+
if (status < 0)
1325+
goto out_delete_evlist;
13251326

13261327
sort__setup_elide(stdout);
13271328

0 commit comments

Comments
 (0)