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=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 C3D5FC433E0 for ; Tue, 23 Jun 2020 20:42:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 985D921919 for ; Tue, 23 Jun 2020 20:42:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592944975; bh=kORmj3Jqmaq1UgJjqWnJ6xS+gE+avf9nMSLRJyuvJwQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0r/ICDQXKPaJ7/+5KCaloNVpxB/0Z/kkywFKWwa7K5YfKXLxz7eB2tkqA9IG5tYZ7 KOFamgxo/vMAFXcUtWbD9Djgb6Chs+A2rCw05IJS0OWxpqTyfBBR1BfoRVJWD/hlIg U+2zoI+g7MNrH5owuFZIEk7QWg290VN/TNu/59gs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392461AbgFWUmx (ORCPT ); Tue, 23 Jun 2020 16:42:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:39476 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390256AbgFWUmu (ORCPT ); Tue, 23 Jun 2020 16:42:50 -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 0EF3B20767; Tue, 23 Jun 2020 20:42:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592944969; bh=kORmj3Jqmaq1UgJjqWnJ6xS+gE+avf9nMSLRJyuvJwQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kd/i6UmmFlEZ7nsZGBoIwiSlG5x2rra/WpWwyMA2p4X3xBsfoHhED+BIDfdQXpk6y IpKyILA3IGbwPItnXm5BQJgFXuLCQ2/dU9Y9osBhjjprqIUza5GCgX7NCk/7bZ54Pa vXzNKt12XuaYrvC9ohztkUR6VRufiZ4J8XqeWjRg= 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 4.19 165/206] perf report: Fix NULL pointer dereference in hists__fprintf_nr_sample_events() Date: Tue, 23 Jun 2020 21:58:13 +0200 Message-Id: <20200623195325.114676312@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195316.864547658@linuxfoundation.org> References: <20200623195316.864547658@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 5312c761a5dba..05eae94d09cb8 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -447,8 +447,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