From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Changbin Du <changbin.du@gmail.com>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Namhyung Kim <namhyung@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Steven Rostedt <rostedt@goodmis.org>,
Arnaldo Carvalho de Melo <acme@redhat.com>,
Sasha Levin <sashal@kernel.org>
Subject: [PATCH AUTOSEL 3.18 10/15] perf top: Fix error handling in cmd_top()
Date: Fri, 29 Mar 2019 20:57:25 -0400 [thread overview]
Message-ID: <20190330005730.28777-10-sashal@kernel.org> (raw)
In-Reply-To: <20190330005730.28777-1-sashal@kernel.org>
From: Changbin Du <changbin.du@gmail.com>
[ 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>
---
tools/perf/builtin-top.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index c5b9c3f01d85..ea02883c3405 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -1256,8 +1256,9 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)
symbol_conf.priv_size = sizeof(struct annotation);
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);
--
2.19.1
next prev parent reply other threads:[~2019-03-30 0:58 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-30 0:57 [PATCH AUTOSEL 3.18 01/15] perf/core: Restore mmap record type correctly Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 02/15] ext4: report real fs size after failed resize Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 03/15] ALSA: echoaudio: add a check for ioremap_nocache Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 04/15] ALSA: sb8: add a check for request_region Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 05/15] IB/mlx4: Fix race condition between catas error reset and aliasguid flows Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 06/15] mmc: davinci: remove extraneous __init annotation Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 07/15] ALSA: opl3: fix mismatch between snd_opl3_drum_switch definition and declaration Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 08/15] thermal/int340x_thermal: fix mode setting Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 09/15] tools/power turbostat: return the exit status of a command Sasha Levin
2019-03-30 0:57 ` Sasha Levin [this message]
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 11/15] perf tests: Fix a memory leak in test__perf_evsel__tp_sched_test() Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 12/15] x86/hpet: Prevent potential NULL pointer dereference Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 13/15] x86/cpu/cyrix: Use correct macros for Cyrix calls on Geode processors Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 14/15] iommu/vt-d: Check capability before disabling protected memory Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 15/15] fix incorrect error code mapping for OBJECTID_NOT_FOUND Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190330005730.28777-10-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=acme@redhat.com \
--cc=ast@kernel.org \
--cc=changbin.du@gmail.com \
--cc=daniel@iogearbox.net \
--cc=linux-kernel@vger.kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).