Commit 45b4f402 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf report: Avoid SEGV in report__setup_sample_type() 



In some cases evsel->name is lazily initialized in evsel__name(). If not
initialized passing NULL to strstr() leads to a SEGV.

Fixes: ccb17cae ("perf report: Set PERF_SAMPLE_DATA_SRC bit for Arm SPE event")
Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linux.dev>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20240508035301.1554434-4-irogers@google.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent de6a9083

tools/perf/builtin-report.c

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ static int report__setup_sample_type(struct report *rep) 
		 * compatibility, set the bit if it's an old perf data file.

		 */

		evlist__for_each_entry(session->evlist, evsel) {

			if (strstr(evsel->name, "arm_spe") &&

			if (strstr(evsel__name(evsel), "arm_spe") &&

				!(sample_type & PERF_SAMPLE_DATA_SRC)) {

				evsel->core.attr.sample_type |= PERF_SAMPLE_DATA_SRC;

				sample_type |= PERF_SAMPLE_DATA_SRC;