diff options
| author | Adrian Hunter <adrian.hunter@intel.com> | 2019-11-14 16:25:38 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-17 20:35:51 +0100 |
| commit | 4f579272b0e06943adabfab13d004e65e356a622 (patch) | |
| tree | aa10a15d09cbd82dd1630e3ecc259bc996f4bfce | |
| parent | 1b83d5756a89bd2824d6aad672782957bfa1e9a2 (diff) | |
| download | linux-stable-4f579272b0e06943adabfab13d004e65e356a622.tar.gz linux-stable-4f579272b0e06943adabfab13d004e65e356a622.tar.bz2 linux-stable-4f579272b0e06943adabfab13d004e65e356a622.zip | |
perf callchain: Fix segfault in thread__resolve_callchain_sample()
[ Upstream commit aceb98261ea7d9fe38f9c140c5531f0b13623832 ]
Do not dereference 'chain' when it is NULL.
$ perf record -e intel_pt//u -e branch-misses:u uname
$ perf report --itrace=l --branch-history
perf: Segmentation fault
Fixes: e9024d519d89 ("perf callchain: Honour the ordering of PERF_CONTEXT_{USER,KERNEL,etc}")
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lore.kernel.org/lkml/20191114142538.4097-1-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | tools/perf/util/machine.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index 003b70daf0bf..21f867a543e0 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -2276,7 +2276,7 @@ static int thread__resolve_callchain_sample(struct thread *thread, } check_calls: - if (callchain_param.order != ORDER_CALLEE) { + if (chain && callchain_param.order != ORDER_CALLEE) { err = find_prev_cpumode(chain, thread, cursor, parent, root_al, &cpumode, chain->nr - first_call); if (err) |