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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DBAB0C6FD18 for ; Tue, 18 Apr 2023 15:26:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=cX8lRKOykZNFa8VBevgOydVzHSUUZCdf35/Sn7XDTnE=; b=Jnb7wfMHdmiAk7 ZebcvL9D21bmui2k2kWr/gMDZmsQcWh8Yag5dldW6G2m320IpvoovhXJdCpGe/MRLcebtabXffL4z HZcHjfVR3P4ekHNtuNE5A9oCYh4MLAoV8kXJfTOv29sbymJrvRkEVDRm5ERSzFPKKQPwKfNZYNnxs E5VtFo4/rlmjs8mFX1pMreKT7hqM3Uhlv5kWWDVCsrQ/qUPFZccmkup+Q1fQlbz5YYXaU/YAysJu/ IU6oFHe9WkgreAyU88L1A4Dj91kHzGJr/svfimNcU1vf71GPE009x9F6X6GkoYpIZr4PLkQBP0PP0 KjzkzkTCGn8qjBTyzLbg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1ponDg-002aU7-00; Tue, 18 Apr 2023 15:26:12 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1ponDf-002aTI-0e for linux-arm-kernel@bombadil.infradead.org; Tue, 18 Apr 2023 15:26:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=YCTelmaiL+W9uSQ/wf6s9ElNzZfZeY9mnGRdeDNDvts=; b=XehduLNh6G3kZfRyucLaEtIII2 Y1+CjE4LjcP/Tq4XtA3ctSAzbrK5ex5jUGeyQtSZkzL1nInnSepb5L3EJ+RqFGE6Gzwv4Zpw34AXW ePiVOp54uB4Uev8Z/0hUrcG4Jl5sC6x+aawlZNzva4pQbP5PnT4lF4henmvNBPVwq/+hKxYRx3j4f XJDJq8NzgyJjs+LzQxY9U1SaOaXoosTu4PXMqgpPPN6Q498PtFiRHgJdYHcF/a1Z64Ts4qnc/s3bm yn6pahwSVGUcdQnEdWTmol2wJNJxrT61MIyx5sjtxFb3Fft3t5nETTzdyjMUM1opmxkkxnhB/B20W lsXdXJkQ==; Received: from [187.19.238.117] (helo=quaco.ghostprotocols.net) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1ponDd-00CPC3-1a; Tue, 18 Apr 2023 15:26:09 +0000 Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id EFA67403B5; Tue, 18 Apr 2023 12:26:04 -0300 (-03) Date: Tue, 18 Apr 2023 12:26:04 -0300 From: Arnaldo Carvalho de Melo To: James Clark Cc: linux-perf-users@vger.kernel.org, Mathieu Poirier , Suzuki K Poulose , Mike Leach , Leo Yan , John Garry , Will Deacon , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] perf: cs-etm: Fix segfault in dso lookup Message-ID: References: <20230418141203.673465-1-james.clark@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230418141203.673465-1-james.clark@arm.com> X-Url: http://acmel.wordpress.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Em Tue, Apr 18, 2023 at 03:12:03PM +0100, James Clark escreveu: > map__dso() is called before thread__find_map() which always results in a > null pointer dereference. Fix it by finding first, then checking if it > exists. > > Fixes: 63df0e4bc368 ("perf map: Add accessor for dso") Thanks, applied, checking if another such pattern slipped by in that cset. - Arnaldo > Signed-off-by: James Clark > --- > tools/perf/util/cs-etm.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c > index 103865968700..8dd81ddd9e4e 100644 > --- a/tools/perf/util/cs-etm.c > +++ b/tools/perf/util/cs-etm.c > @@ -885,9 +885,11 @@ static u32 cs_etm__mem_access(struct cs_etm_queue *etmq, u8 trace_chan_id, > thread = etmq->etm->unknown_thread; > } > > - dso = map__dso(al.map); > + if (!thread__find_map(thread, cpumode, address, &al)) > + return 0; > > - if (!thread__find_map(thread, cpumode, address, &al) || !dso) > + dso = map__dso(al.map); > + if (!dso) > return 0; > > if (dso->data.status == DSO_DATA_STATUS_ERROR && > -- > 2.34.1 > -- - Arnaldo _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel