From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C43E3C352AA for ; Tue, 1 Oct 2019 11:14:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9B56521920 for ; Tue, 1 Oct 2019 11:14:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569928448; bh=rc/G51SEZSV+k/QhTTyYtmQ6CE+/grShdo2SWr/0n7U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=00UxMAQE8/Bfx09vLzmiUUaBQUiSKyPMnfR8Wz8IpfGZnW8pP2MxpJW7DlIcZ2CvI 7fGj8I/Z9G95P48ncGJ+oQWctSyboGSrTcKfg49k3LU6I625CJUV+UIvW/cL2q+hUw xSPbm2HicU4QJRTxB731QPFpBmqmcLemOzBra+Rw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732197AbfJALOH (ORCPT ); Tue, 1 Oct 2019 07:14:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:36056 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731944AbfJALOE (ORCPT ); Tue, 1 Oct 2019 07:14:04 -0400 Received: from quaco.ghostprotocols.net (177.206.223.101.dynamic.adsl.gvt.net.br [177.206.223.101]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1AC7821A4C; Tue, 1 Oct 2019 11:13:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569928443; bh=rc/G51SEZSV+k/QhTTyYtmQ6CE+/grShdo2SWr/0n7U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2JTyK493/CxuKiT9d3v5UzZd3pnTjLzrH/0WxMJGnOMF3aKn2b+qWFne3tzNZmjiH rqGC+8q7/H6b7mFnnpUgtmxp3EvXZUX50134H89AEDG+Vvht+Ug2pxWliaapjxyYxe OC2CRF/VyqihAq+hYtkT7Xq6GFTknyp/VjQudxqE= From: Arnaldo Carvalho de Melo To: Ingo Molnar , Thomas Gleixner Cc: Jiri Olsa , Namhyung Kim , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , Russell King - ARM Linux admin , Adrian Hunter , Alexander Shishkin , Peter Zijlstra , Will Deacon Subject: [PATCH 23/24] perf annotate: Return appropriate error code for allocation failures Date: Tue, 1 Oct 2019 08:12:15 -0300 Message-Id: <20191001111216.7208-24-acme@kernel.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191001111216.7208-1-acme@kernel.org> References: <20191001111216.7208-1-acme@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnaldo Carvalho de Melo We should return errno or the annotation extra range understood by symbol__strerror_disassemble() instead of -1, fix it, returning ENOMEM instead. Reported-by: Russell King - ARM Linux admin Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Jiri Olsa Cc: Namhyung Kim Cc: Peter Zijlstra , Cc: Will Deacon Link: https://lkml.kernel.org/n/tip-8of1cmj3rz0mppfcshc9bbqq@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/annotate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index dc15352924f9..b49ecdd51188 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -1668,7 +1668,7 @@ static int dso__disassemble_filename(struct dso *dso, char *filename, size_t fil build_id_path = strdup(filename); if (!build_id_path) - return -1; + return ENOMEM; /* * old style build-id cache has name of XX/XXXXXXX.. while @@ -2977,7 +2977,7 @@ int symbol__annotate2(struct symbol *sym, struct map *map, struct evsel *evsel, notes->offsets = zalloc(size * sizeof(struct annotation_line *)); if (notes->offsets == NULL) - return -1; + return ENOMEM; if (perf_evsel__is_group_event(evsel)) nr_pcnt = evsel->core.nr_members; -- 2.21.0