From patchwork Tue Jul 9 18:31:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaldo Carvalho de Melo X-Patchwork-Id: 168760 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp8896651ilk; Tue, 9 Jul 2019 11:32:29 -0700 (PDT) X-Google-Smtp-Source: APXvYqwjY/9BvER9bep6jlBAd2wEppnOB8mXHcsTxgCAu0T9TiPWWD3OnBwcxZt+5FfdO9MoFXKB X-Received: by 2002:a65:6081:: with SMTP id t1mr18894787pgu.9.1562697149645; Tue, 09 Jul 2019 11:32:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562697149; cv=none; d=google.com; s=arc-20160816; b=qANsNr8R3klYhwKsGUGI+SVVvm26alogGgD7Z5CNThahd30JtD79g5SkPDY9oVK7XY AW2NO2EndMxXBq5OHmHo/X9DxqInQxG8cTMsifTwj+pQQM6vd5/OrLTF/WHSSZbjhSFn asYLu6iB+y3mM9jNgSNvVZcUjiD+irceXQ79Jm5EqucI3u3aMkhae26WKeGuTq+tK/z5 oJZOwdrYbBiZnbMGKoB+vK+A3V+eygz0iXL84m9aqa/poGjehTDIBsrWly+IJ9XBClVb MJsznfp3hFyv0fw/CS4tLOeOMiQc2cV8FXtjyWJGJ1nveW6LMQfQfzA6yOkx5luer1IL Hvew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=4OXxn3DW2sslp44VkLFd6P05tzxSwup5/MayWZIMCbo=; b=N/4C7SAEjzI6nmqvd+gmJLyojYVLggGkNCRUkKsJOlQFz6YDiKGbdCWA4X3hM/ET/Q FHn7TTOcxM5LyuK4slfKhwCqw0sCc1a8zyWUaipE9o81qBTftVvvj/hU6JqAFkGAeHxb /oUzqJmkIWJMNHJnO0B1c2xDX7XIKEIsIMmMr9ezDW3xmnnpue+YaHvB8iNegzS/HJCL xhq/I/uXwKDMb+CMHZQXZA+RwI3QGD4AvbjMfS7Vv1w1ycla4teEnBhSh74jbOF/2vrC ueTGHpQuiQrgdC4ZL2dpdDM2a0drdFJbAlxtZmcjZnvrt01lj4FhugJlOryKI10IOttw umsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="am5/w0YM"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o19si24636534pgl.389.2019.07.09.11.32.29; Tue, 09 Jul 2019 11:32:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="am5/w0YM"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729140AbfGISc2 (ORCPT + 30 others); Tue, 9 Jul 2019 14:32:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:53836 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729094AbfGISc0 (ORCPT ); Tue, 9 Jul 2019 14:32:26 -0400 Received: from quaco.ghostprotocols.net (unknown [179.97.35.11]) (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 7FD7221743; Tue, 9 Jul 2019 18:32:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562697145; bh=LzlQIF4A49g3wOWfYMbmSZepSv/fUbacMvy8iT48q8c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=am5/w0YM83bIKrJUqGCW+batDUhjaHXgi7HVsURprAOsei5iju27lqv0YAlsH85VU gd182DK8TEn/+xmW4r92QB0t6z3ZrhmYxFogvmwnbbPbPg2OAa5pP6UQ1vBBKrZeue YwL8273Rnsy8SQJQpTxUxUFXfQEjK59/9glm9X5Y= 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, Leo Yan , Adrian Hunter , Alexander Shishkin , Alexey Budankov , Alexios Zavras , Andi Kleen , Changbin Du , "David S . Miller" , Davidlohr Bueso , Eric Saint-Etienne , Jin Yao , Konstantin Khlebnikov , Mathieu Poirier , Peter Zijlstra , Rasmus Villemoes , Song Liu , Suzuki Poulouse , Thomas Richter , linux-arm-kernel@lists.infradead.org, Arnaldo Carvalho de Melo Subject: [PATCH 08/25] perf session: Fix potential NULL pointer dereference found by the smatch tool Date: Tue, 9 Jul 2019 15:31:09 -0300 Message-Id: <20190709183126.30257-9-acme@kernel.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190709183126.30257-1-acme@kernel.org> References: <20190709183126.30257-1-acme@kernel.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Leo Yan Based on the following report from Smatch, fix the potential NULL pointer dereference check. tools/perf/util/session.c:1252 dump_read() error: we previously assumed 'evsel' could be null (see line 1249) tools/perf/util/session.c 1240 static void dump_read(struct perf_evsel *evsel, union perf_event *event) 1241 { 1242 struct read_event *read_event = &event->read; 1243 u64 read_format; 1244 1245 if (!dump_trace) 1246 return; 1247 1248 printf(": %d %d %s %" PRIu64 "\n", event->read.pid, event->read.tid, 1249 evsel ? perf_evsel__name(evsel) : "FAIL", 1250 event->read.value); 1251 1252 read_format = evsel->attr.read_format; ^^^^^^^ 'evsel' could be NULL pointer, for this case this patch directly bails out without dumping read_event. Signed-off-by: Leo Yan Acked-by: Jiri Olsa Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Alexey Budankov Cc: Alexios Zavras Cc: Andi Kleen Cc: Changbin Du Cc: David S. Miller Cc: Davidlohr Bueso Cc: Eric Saint-Etienne Cc: Jin Yao Cc: Konstantin Khlebnikov Cc: Mathieu Poirier Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Rasmus Villemoes Cc: Song Liu Cc: Suzuki Poulouse Cc: Thomas Gleixner Cc: Thomas Richter Cc: linux-arm-kernel@lists.infradead.org Link: http://lkml.kernel.org/r/20190702103420.27540-9-leo.yan@linaro.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/session.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.21.0 diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 54cf163347f7..2e61dd6a3574 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -1249,6 +1249,9 @@ static void dump_read(struct perf_evsel *evsel, union perf_event *event) evsel ? perf_evsel__name(evsel) : "FAIL", event->read.value); + if (!evsel) + return; + read_format = evsel->attr.read_format; if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED)