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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 347CCC433E0 for ; Tue, 23 Jun 2020 21:10:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0AE7A20702 for ; Tue, 23 Jun 2020 21:10:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592946654; bh=vSHQ+YDY/gw7mpzO9YWRrdcHmIh6D564DwmdvkyEkC4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=tbHB3PfgquwHDJuSkfo5lwwIp1CaSBsOuWOgKHGjDgReCgatW9ZGQcsYkX2Kp/oGK 72Ao6uA+TCHwDS6PrzMq/nTZA4UT45g5DY3B99rSZTvmGXuOxNjGJWzJIKYIjW2V+b NA/3mR2r2MoqfLObVOMPSrnOK14RQHBDwZhQWlMI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391615AbgFWVKt (ORCPT ); Tue, 23 Jun 2020 17:10:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:53998 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390870AbgFWUc4 (ORCPT ); Tue, 23 Jun 2020 16:32:56 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 C690B20836; Tue, 23 Jun 2020 20:32:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592944376; bh=vSHQ+YDY/gw7mpzO9YWRrdcHmIh6D564DwmdvkyEkC4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YBtfNhfPGEzFK941kdYKnQ2O2oqljYNi0GmLpWO97bm1nFOCgWsmAgy5YFlL90QkM 8DsDfnhINrngprz7lk4MRLlQB5KFO9qrt+JH5dkiOfmZtaXTGENjTRpYeoxxgFgo/l qpbRQnXsQuoFEgwqLiujHRoaN4HR4Fz9ecLPip4k= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Adrian Hunter , Alexander Shishkin , Ingo Molnar , Jiri Olsa , Kan Liang , Mark Rutland , Namhyung Kim , Peter Zijlstra , Gaurav Singh , Sasha Levin Subject: [PATCH 5.4 263/314] perf report: Fix NULL pointer dereference in hists__fprintf_nr_sample_events() Date: Tue, 23 Jun 2020 21:57:38 +0200 Message-Id: <20200623195351.518962999@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195338.770401005@linuxfoundation.org> References: <20200623195338.770401005@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Gaurav Singh [ Upstream commit 11b6e5482e178055ec1f2444b55f2518713809d1 ] The 'evname' variable can be NULL, as it is checked a few lines back, check it before using. Fixes: 9e207ddfa207 ("perf report: Show call graph from reference events") Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Ingo Molnar Cc: Jiri Olsa Cc: Kan Liang Cc: Mark Rutland Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lore.kernel.org/lkml/ Signed-off-by: Gaurav Singh Signed-off-by: Sasha Levin --- tools/perf/builtin-report.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index 4d8db41b949a4..d3c0b04e2e22b 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -462,8 +462,7 @@ static size_t hists__fprintf_nr_sample_events(struct hists *hists, struct report if (rep->time_str) ret += fprintf(fp, " (time slices: %s)", rep->time_str); - if (symbol_conf.show_ref_callgraph && - strstr(evname, "call-graph=no")) { + if (symbol_conf.show_ref_callgraph && evname && strstr(evname, "call-graph=no")) { ret += fprintf(fp, ", show reference callgraph"); } -- 2.25.1