[PATCH v3 1/3] perf hists browser: Fix segfault if use symbol filter in cmdline

Path	csiph.com!optima2.xanadu-bbs.net!xanadu-bbs.net!news.glorb.com!bofh.it!news.nic.it!robomod
From	Wang Nan <wangnan0@huawei.com>
Newsgroups	linux.kernel
Subject	[PATCH v3 1/3] perf hists browser: Fix segfault if use symbol filter in cmdline
Date	Mon, 07 Dec 2015 03:40:01 +0100
Message-ID	<qCTSx-6PC-1@gated-at.bofh.it> (permalink)
References	<qCTSx-6PC-3@gated-at.bofh.it>
X-Original-To	<acme@redhat.com>, <acme@kernel.org>, <namhyung@kernel.org>
X-Mailer	git-send-email 1.8.3.4
MIME-Version	1.0
Content-Type	text/plain
X-Originating-IP	[10.107.193.248]
X-Cfilter-Loop	Reflected
X-Mirapoint-Virus-Rapid-Raw	score=unknown(0), refid=str=0001.0A020202.5664F093.0099,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32
X-Mirapoint-Loop-ID	6a5d768f72fb2fa6588d79cd2476440c
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	54
Organization	linux.* mail to news gateway
X-Original-Cc	<linux-kernel@vger.kernel.org>, <pi3orama@163.com>, <lizefan@huawei.com>, Wang Nan <wangnan0@huawei.com>
X-Original-Date	Mon, 7 Dec 2015 02:35:44 +0000
X-Original-Message-ID	<1449455746-41952-2-git-send-email-wangnan0@huawei.com>
X-Original-References	<1449455746-41952-1-git-send-email-wangnan0@huawei.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1284967

Show key headers only | View raw

If feed perf a symbol filter in cmdline and the result is empty,
pressing 'Enter' in the hist browser causes crash:

 # ./perf report perf.data   <-- Common mistake for beginners

Then press 'Enter':

 perf: Segmentation fault
 -------- backtrace --------
 /home/wangnan/perf[0x53e578]
 /lib64/libc.so.6(+0x3545f)[0x7f76bafe045f]
 /home/wangnan/perf[0x539dd4]
 /home/wangnan/perf(perf_evlist__tui_browse_hists+0x96)[0x53d216]
 /home/wangnan/perf(cmd_report+0x1b9f)[0x442c7f]
 /home/wangnan/perf[0x47efa2]
 /home/wangnan/perf(main+0x5f5)[0x432fa5]
 /lib64/libc.so.6(__libc_start_main+0xf4)[0x7f76bafccbd4]
 /home/wangnan/perf[0x4330d4]

This is because 'perf.data' is interpreted as a symbol filter, and the
result is empty, so selection is empty. However,
hist_browser__toggle_fold() forgets to check it.

This patch simply return false when selection is NULL.

Signed-off-by: Wang Nan <wangnan0@huawei.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/ui/browsers/hists.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index dcdcbaf..75ed14b 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -340,6 +340,9 @@ static bool hist_browser__toggle_fold(struct hist_browser *browser)
 	struct callchain_list *cl = container_of(ms, struct callchain_list, ms);
 	bool has_children;
 
+	if (!he || !ms)
+		return false;
+
 	if (ms == &he->ms)
 		has_children = hist_entry__toggle_fold(he);
 	else
-- 
1.8.3.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH v3 1/3] perf hists browser: Fix segfault if use symbol filter in cmdline Wang Nan <wangnan0@huawei.com> - 2015-12-07 03:40 +0100
  [tip:perf/core] perf hists browser:   Fix segfault if use symbol filter in cmdline tip-bot for Wang Nan <tipbot@zytor.com> - 2015-12-08 06:20 +0100

csiph-web