From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752418AbdK2Gcr (ORCPT ); Wed, 29 Nov 2017 01:32:47 -0500 Received: from terminus.zytor.com ([65.50.211.136]:35397 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752081AbdK2Gco (ORCPT ); Wed, 29 Nov 2017 01:32:44 -0500 Date: Tue, 28 Nov 2017 22:28:57 -0800 From: tip-bot for Andrei Vagin Message-ID: Cc: hpa@zytor.com, acme@redhat.com, namhyung@kernel.org, mingo@kernel.org, peterz@infradead.org, tglx@linutronix.de, avagin@openvz.org, jolsa@redhat.com, alexander.shishkin@linux.intel.com, vvs@virtuozzo.com, linux-kernel@vger.kernel.org Reply-To: linux-kernel@vger.kernel.org, vvs@virtuozzo.com, alexander.shishkin@linux.intel.com, jolsa@redhat.com, avagin@openvz.org, tglx@linutronix.de, peterz@infradead.org, mingo@kernel.org, namhyung@kernel.org, acme@redhat.com, hpa@zytor.com In-Reply-To: <20171108002246.8924-2-avagin@openvz.org> References: <20171108002246.8924-2-avagin@openvz.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf trace: Fix an exit code of trace__symbols_init Git-Commit-ID: 35c33633abc14b906e84b7b0115ede6df6830120 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 35c33633abc14b906e84b7b0115ede6df6830120 Gitweb: https://git.kernel.org/tip/35c33633abc14b906e84b7b0115ede6df6830120 Author: Andrei Vagin AuthorDate: Tue, 7 Nov 2017 16:22:46 -0800 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 28 Nov 2017 14:20:15 -0300 perf trace: Fix an exit code of trace__symbols_init Currently if trace_event__register_resolver() fails, we return -errno, but we can't be sure that errno isn't zero in this case. Signed-off-by: Andrei Vagin Reviewed-by: Jiri Olsa Cc: Alexander Shishkin Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Vasily Averin Link: http://lkml.kernel.org/r/20171108002246.8924-2-avagin@openvz.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-trace.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index f2757d3..84debdb 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -1152,12 +1152,14 @@ static int trace__symbols_init(struct trace *trace, struct perf_evlist *evlist) if (trace->host == NULL) return -ENOMEM; - if (trace_event__register_resolver(trace->host, trace__machine__resolve_kernel_addr) < 0) - return -errno; + err = trace_event__register_resolver(trace->host, trace__machine__resolve_kernel_addr); + if (err < 0) + goto out; err = __machine__synthesize_threads(trace->host, &trace->tool, &trace->opts.target, evlist->threads, trace__tool_process, false, trace->opts.proc_map_timeout, 1); +out: if (err) symbol__exit();