From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933725AbdKHAXK (ORCPT ); Tue, 7 Nov 2017 19:23:10 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:55469 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933597AbdKHAWx (ORCPT ); Tue, 7 Nov 2017 19:22:53 -0500 X-Google-Smtp-Source: ABhQp+RmAcygS54OcBIyx7Dnw/AlgyeLjNzxRiicbiJwPdFUb0KBCNbIYI6C3qrfiiznSJyncTHLKg== From: Andrei Vagin To: linux-kernel@vger.kernel.org Cc: Vasily Averin , Andrei Vagin , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Alexander Shishkin , Jiri Olsa , Namhyung Kim Subject: [PATCH 2/2] perf/trace: fix an exit code of trace__symbols_init Date: Tue, 7 Nov 2017 16:22:46 -0800 Message-Id: <20171108002246.8924-2-avagin@openvz.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171108002246.8924-1-avagin@openvz.org> References: <20171108002246.8924-1-avagin@openvz.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently if trace_event__register_resolver() fails, we return -errno, but we can't be sure that errno isn't zero in this case. Cc: Peter Zijlstra Cc: Ingo Molnar Cc: Arnaldo Carvalho de Melo Cc: Alexander Shishkin Cc: Jiri Olsa Cc: Namhyung Kim Signed-off-by: Andrei Vagin --- 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 f2757d38c7d7..84debdbad327 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(); -- 2.13.6