From patchwork Tue Jul 9 18:31:21 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: 168762 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp8897398ilk; Tue, 9 Jul 2019 11:33:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqyYyBgyr9SgFuMq7wih/qSiSU8XtpN0IthM9U/XCe7Rw22KaSFxxVkXa8R1+AHg8pw1xHOn X-Received: by 2002:a65:610a:: with SMTP id z10mr32402334pgu.178.1562697194610; Tue, 09 Jul 2019 11:33:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562697194; cv=none; d=google.com; s=arc-20160816; b=o31KBcgmxkxKJ+GuttabsUZ/ZdXgdZc/yC7Dn8/KfzJbqkZRqHOWEd6fiBmNrLM3xp KxjUkm79ppq1b4vmskdO2sOQzBJQy5J51urHXl+kPYiA2YhR+xYEmIly0wrETax9nVAy a6jhTVPfj8v8IscWB+UNA5W0TTsGQ6x3zu6iHNxsC3Sev3Rkgfzs+ZyOt3EDQWuw1SYi FCU0Q37DdgSJqad/O8ODW26M+yZ4xIVkw3T96hj80RS+CHm1IrbNqLhloPjeQxAvjvvq xRV0X8gpLkSAcebL8lchzKINM9iBwFkQFVSo/qWiepTYuAw2dRiY7rji+uI2pcaYxGpf yjuQ== 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=VSMlYjQN+VOfSG02injKM/DMDTwfBDQ0N/ogG02SSxI=; b=xLQ19a/8Pdblnl3n/iTW0VnzwLkALO0NWXtdqQku2rnTDbfFDHWPPOTl1bOvFIf2+x ymzY2ToFsCcpt/5M69H9EiLRaFU8nB2h6y3STvlpqe0sjqlIUhw87QDhc+sWrEqHEJRh mUAZ0rBb9earl+Hwk+TfB5w3jWzQVhohT9wOFaJphwSfwiUEmOV80hRBD7kVI/9rl6NU 8AMVPuoxsR01tMT94dwkp0rWM/dOAao6Z5J3gkk7QueJRjQqgr7WGtusJy9Ps2gWya4n YFy1CMvRdaO9WRIjpoApOKjsOoEFuGe/qJcvWasa4LcJPSF4itdLn830ix9yb0J+hvSd Okvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=f8iQL7E1; 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 x185si24921602pfx.243.2019.07.09.11.33.14; Tue, 09 Jul 2019 11:33:14 -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=f8iQL7E1; 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 S1729294AbfGISdN (ORCPT + 30 others); Tue, 9 Jul 2019 14:33:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:54836 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726218AbfGISdK (ORCPT ); Tue, 9 Jul 2019 14:33:10 -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 3C54520656; Tue, 9 Jul 2019 18:33:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562697189; bh=KszjUYtgLQLtSW1cBi/FB/Vr+ozCmXKbJls+v8/d2Fc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f8iQL7E15IMCw60dkBnTlvmxBoAUZtTsRcEuiS+ZwBJw3vfoOPCqXBzOWoMj3nxEN CkuFqdIoeSN9PJqvxi/3u5L+Zsj5RWauMq2A/P5L6Ayfh4F/jjnQMPH71ylZC/Zkju VU12QzNPW5IqWzjl/TjUVVrabDIAKCaL5FoxfEZs= 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 , Andi Kleen , Mathieu Poirier , Suzuki Poulouse , linux-arm-kernel@lists.infradead.org, Arnaldo Carvalho de Melo Subject: [PATCH 20/25] perf hists browser: Fix potential NULL pointer dereference found by the smatch tool Date: Tue, 9 Jul 2019 15:31:21 -0300 Message-Id: <20190709183126.30257-21-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/ui/browsers/hists.c:641 hist_browser__run() error: we previously assumed 'hbt' could be null (see line 625) tools/perf/ui/browsers/hists.c:3088 perf_evsel__hists_browse() error: we previously assumed 'browser->he_selection' could be null (see line 2902) tools/perf/ui/browsers/hists.c:3272 perf_evsel_menu__run() error: we previously assumed 'hbt' could be null (see line 3260) This patch firstly validating the pointers before access them, so can fix potential NULL pointer dereference. Signed-off-by: Leo Yan Acked-by: Jiri Olsa Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Andi Kleen Cc: Mathieu Poirier Cc: Namhyung Kim Cc: Suzuki Poulouse Cc: linux-arm-kernel@lists.infradead.org Link: http://lkml.kernel.org/r/20190708143937.7722-2-leo.yan@linaro.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/ui/browsers/hists.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) -- 2.21.0 diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c index 85581cfb9112..a94eb0755e8b 100644 --- a/tools/perf/ui/browsers/hists.c +++ b/tools/perf/ui/browsers/hists.c @@ -639,7 +639,11 @@ int hist_browser__run(struct hist_browser *browser, const char *help, switch (key) { case K_TIMER: { u64 nr_entries; - hbt->timer(hbt->arg); + + WARN_ON_ONCE(!hbt); + + if (hbt) + hbt->timer(hbt->arg); if (hist_browser__has_filter(browser) || symbol_conf.report_hierarchy) @@ -2821,7 +2825,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, { struct hists *hists = evsel__hists(evsel); struct hist_browser *browser = perf_evsel_browser__new(evsel, hbt, env, annotation_opts); - struct branch_info *bi; + struct branch_info *bi = NULL; #define MAX_OPTIONS 16 char *options[MAX_OPTIONS]; struct popup_action actions[MAX_OPTIONS]; @@ -3087,7 +3091,9 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, goto skip_annotation; if (sort__mode == SORT_MODE__BRANCH) { - bi = browser->he_selection->branch_info; + + if (browser->he_selection) + bi = browser->he_selection->branch_info; if (bi == NULL) goto skip_annotation; @@ -3271,7 +3277,8 @@ static int perf_evsel_menu__run(struct perf_evsel_menu *menu, switch (key) { case K_TIMER: - hbt->timer(hbt->arg); + if (hbt) + hbt->timer(hbt->arg); if (!menu->lost_events_warned && menu->lost_events &&