Skip to contentSkip to conversation

perf pmu: Avoid segv for missing name/alias_name in wildcarding

PATCH Applied Ian Rogers 2 participants 2 messages May 27, 2025 – May 28, 2025 perf events

lore
Share & tools
lore

Ian Rogers

author reviewer
#0 lore raw

PATCH v2 1/1 perf pmu: Avoid segv for missing name/alias_name in wildcarding

The pmu name or alias_name fields may be NULL and should be skipped if so. This is done in all loops of perf_pmu___name_match except the final wildcard loop which was an oversight.

Fixes c786468a3585 ("perf pmu: Rename name matching for no suffix or wildcard variants")

---
v2. Rebase resolving merge conflicts, add Namhyung's Acked-by.

---
 tools/perf/util/pmu.c | 3 +++
 1 file changed, 3 insertions(+)
tools/perf/util/pmu.c +3 -0
index bc1178234d3b..609828513f6c 100644
@@ -2143,6 +2143,9 @@ static bool perf_pmu___name_match(const struct perf_pmu *pmu, const char *to_mat
 	for (size_t i = 0; i < ARRAY_SIZE(names); i++) {
 		const char *name = names[i];
 
+		if (!name)
+			continue;
+
 		if (wildcard && perf_pmu__match_wildcard_uncore(name, to_match))
 			return true;
 		if (!wildcard && perf_pmu__match_ignoring_suffix_uncore(name, to_match))
Signature · 1 line
2.49.0.1204.g71687c7c1d-goog
maintainer Reviewed-by Kan Liang on v2 1/1 Applied
#1 lore raw
Quoted 5 lines · Ian Rogers

The pmu name or alias_name fields may be NULL and should be skipped if so. This is done in all loops of perf_pmu___name_match except the final wildcard loop which was an oversight.

Fixes c786468a3585 ("perf pmu: Rename name matching for no suffix or wildcard variants")

I fixed the Fixes: to the right commit, as it seems to have been rebased and ended up not present on my local repo:

Fixes 63e287131cf0c59b ("perf pmu: Rename name matching for no suffix or wildcard variants")

⬢ [acme@toolbx perf-tools-next]$ git tag --contains 63e287131cf0c59b | grep ^v6 v6.15
v6.15-rc1
v6.15-rc2
v6.15-rc3
v6.15-rc4
v6.15-rc5
v6.15-rc6
v6.15-rc7
⬢ [acme@toolbx perf-tools-next]$

Or something else:

⬢ [acme@toolbx perf-tools-next]$ git tag --contains 86468a358 | grep ^v6
error: malformed object name 86468a358
⬢ [acme@toolbx perf-tools-next]$ git cat-file -t c786468a3585
fatal: Not a valid object name c786468a3585
⬢ [acme@toolbx perf-tools-next]$

further details:

commit 63e287131cf0c59b026053d6d63fe271604ffa7e

Author: Ian Rogers <[email protected]>
Date:   Fri Jan 31 23:43:18 2025 -0800

perf pmu: Rename name matching for no suffix or wildcard variants

Wildcard PMU naming will match a name like pmu_1 to a PMU name like pmu_10 but not to a PMU name like pmu_2 as the suffix forms part of the match. No suffix matching will match pmu_10 to either pmu_1 or pmu_2. Add or rename matching functions on PMU to make it clearer what kind of matching is being performed.

Thanks, applied.

- Arnaldo

Quoted 25 lines

---
v2. Rebase resolving merge conflicts, add Namhyung's Acked-by.

---
 tools/perf/util/pmu.c | 3 +++
 1 file changed, 3 insertions(+)
tools/perf/util/pmu.c +3 -0
index bc1178234d3b..609828513f6c 100644
@@ -2143,6 +2143,9 @@ static bool perf_pmu___name_match(const struct perf_pmu *pmu, const char *to_mat
 	for (size_t i = 0; i < ARRAY_SIZE(names); i++) {
 		const char *name = names[i];
 
+		if (!name)
+			continue;
+
 		if (wildcard && perf_pmu__match_wildcard_uncore(name, to_match))
 			return true;
 		if (!wildcard && perf_pmu__match_ignoring_suffix_uncore(name, to_match))
Signature · 1 line
2.49.0.1204.g71687c7c1d-goog