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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,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 B1D8CC47256 for ; Wed, 6 May 2020 15:23:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8A47520936 for ; Wed, 6 May 2020 15:23:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588778580; bh=KPtPuwMrowCZsSzUJwgI6G9tX8MZ+9l+rfTrqJRVdfM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=DQLV7TF5GhbtITwmB5TyvvoujmRqWbqYzVPaJIBBIn7bqLHpE7LaMOSL0s9gM5hEd igF51CttGf44xIZptRA+n1QvIDainF2y6fQA7mDrjrvZs7dHDlzJK2Fwzy86YV7aLR J/hrTA9Tu6dG782vg3KI2+zESZ/BIw+Smt2Ml8kw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729625AbgEFPW7 (ORCPT ); Wed, 6 May 2020 11:22:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:37830 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729614AbgEFPW5 (ORCPT ); Wed, 6 May 2020 11:22:57 -0400 Received: from quaco.ghostprotocols.net (unknown [179.97.37.151]) (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 74AAE20CC7; Wed, 6 May 2020 15:22:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588778577; bh=KPtPuwMrowCZsSzUJwgI6G9tX8MZ+9l+rfTrqJRVdfM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bu7UAlBYKJ5l/o6QFSTybyeXGgC2Umnuv11cCQbxVYVpqPlrYkM/ZgqA0Znz0QQlq 5OdxtcSqATQKAw8xN3rR20l0a5P2+YXiQ3cNsVob5IVSYqHi11YnuiJQ3N3VcXai5y MgOfdGkBdo3yD3AOjikgvhyeJPLV0cGgOsTa5lJQ= 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, Ian Rogers , Jiri Olsa , Alexander Shishkin , Mark Rutland , Peter Zijlstra , Stephane Eranian , Arnaldo Carvalho de Melo Subject: [PATCH 04/91] perf script: Avoid NULL dereference on symbol Date: Wed, 6 May 2020 12:21:07 -0300 Message-Id: <20200506152234.21977-5-acme@kernel.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200506152234.21977-1-acme@kernel.org> References: <20200506152234.21977-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: Ian Rogers al->sym may be NULL given current if conditions and may cause a segv. Fixes: d2bedb7863e9 ("perf script: Allow --symbol to accept hexadecimal addresses") Signed-off-by: Ian Rogers Acked-by: Jiri Olsa Cc: Alexander Shishkin Cc: Mark Rutland Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lore.kernel.org/lkml/20200421004329.43109-1-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index dc0e11214ae1..f581550a3015 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c @@ -626,7 +626,7 @@ int machine__resolve(struct machine *machine, struct addr_location *al, ret = strlist__has_entry(symbol_conf.sym_list, al->sym->name); } - if (!(ret && al->sym)) { + if (!ret && al->sym) { snprintf(al_addr_str, sz, "0x%"PRIx64, al->map->unmap_ip(al->map, al->sym->start)); ret = strlist__has_entry(symbol_conf.sym_list, -- 2.21.1