perf report: Avoid SEGV in report__setup_sample_type()
authorIan Rogers <irogers@google.com>
Wed, 8 May 2024 03:53:00 +0000 (20:53 -0700)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Thu, 9 May 2024 21:14:39 +0000 (18:14 -0300)
In some cases evsel->name is lazily initialized in evsel__name(). If not
initialized passing NULL to strstr() leads to a SEGV.

Fixes: ccb17caecfbd542f ("perf report: Set PERF_SAMPLE_DATA_SRC bit for Arm SPE event")
Signed-off-by: Ian 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: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/builtin-report.c

index 0892b6e3e5e77674f2c16a6edeb3c7f0199bb897..69618fb0110b64ea7ed0a65ceda186cca3b0cc99 100644 (file)
@@ -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;