perf pmu: Avoid segv for missing name/alias_name in wildcarding
Ian Rogers
reviewerPATCH 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.
--- tools/perf/util/pmu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/perf/util/pmu.c +3 -1
@@ -2060,7 +2060,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.504.g3bcea36a83-goog
Quoted 6 lines · Ian Rogers
The pmu name or
alias_namefields may be NULL and should be skipped if so. This is done in all loops ofperf_pmu___name_matchexcept the final wildcard loop which was an oversight.Fixes c786468a3585 ("perf pmu: Rename name matching for no suffix or wildcard variants")Signed-off-by Ian Rogers <[email protected]>
Thanks,
Namhyung
Quoted 22 lines
--- tools/perf/util/pmu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)tools/perf/util/pmu.c +3
-1@@ -2060,7 +2060,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.504.g3bcea36a83-goog
Ian Rogers
reviewerQuoted 10 lines · Namhyung Kim
Quoted 6 lines · Ian Rogers
The pmu name or
alias_namefields may be NULL and should be skipped if so. This is done in all loops ofperf_pmu___name_matchexcept the final wildcard loop which was an oversight.Fixes c786468a3585 ("perf pmu: Rename name matching for no suffix or wildcard variants")Signed-off-by Ian Rogers <[email protected]>Acked-by Namhyung Kim <[email protected]>
Ping.
Thanks,
Ian
Quoted 25 lines
Thanks,
NamhyungQuoted 22 lines
--- tools/perf/util/pmu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)tools/perf/util/pmu.c +3
-2@@ -2060,7 +2060,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)) --2.49.0.504.g3bcea36a83-goog
Arnaldo Carvalho de Melo
maintainerQuoted 6 lines · Ian Rogers
Quoted 4 lines · Namhyung Kim
Quoted 3 lines · Ian Rogers
The pmu name or
alias_namefields may be NULL and should be skipped if so. This is done in all loops ofperf_pmu___name_matchexcept the final wildcard loop which was an oversight.
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
Fixes c786468a3585 ("perf pmu: Rename name matching for no suffix or wildcard variants")Signed-off-by Ian Rogers <[email protected]>Acked-by Namhyung Kim <[email protected]>Ping.
⬢ [acme@toolbx perf-tools-next]$ patch -p1 < ./20250402_irogers_perf_pmu_avoid_segv_for_missing_name_alias_name_in_wildcarding.mbx patching file tools/perf/util/pmu.c
Hunk #1 FAILED at 2060.
1 out of 1 hunk FAILED -- saving rejects to file tools/perf/util/pmu.c.rej
⬢ [acme@toolbx perf-tools-next]$
⬢ [acme@toolbx perf-tools-next]$ cat tools/perf/util/pmu.c.rej
perf/util/pmu.c +3 -1
@@ -2060,7 +2060,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))
⬢ [acme@toolbx perf-tools-next]$
⬢ [acme@toolbx perf-tools-next]$ git log --oneline -5 tools/perf/util/pmu.c 754baf426e099fbf perf pmu: Change aliases from list to hashmap 255f5b6d060be5a4 perf parse-events: Add "cpu" term to set the CPU an event is recorded on fa1332a8011eebe1 perf mem/c2c amd: Add ldlat supportfc807b6bde6ad332 perf pmu-events: Add retirement latency to JSON events inside of perf 58b8b5d142a8bd5c perf cpumap: Increment reference count for online cpumap
⬢ [acme@toolbx perf-tools-next]$
Can you please take a look?
- Arnaldo
Ian Rogers
reviewerQuoted 45 lines · Arnaldo Carvalho de Melo
Quoted 6 lines · Ian Rogers
Quoted 4 lines · Namhyung Kim
Quoted 3 lines · Ian Rogers
The pmu name or
alias_namefields may be NULL and should be skipped if so. This is done in all loops ofperf_pmu___name_matchexcept the final wildcard loop which was an oversight.Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
Fixes c786468a3585 ("perf pmu: Rename name matching for no suffix or wildcard variants")Signed-off-by Ian Rogers <[email protected]>Acked-by Namhyung Kim <[email protected]>Ping.
⬢ [acme@toolbx perf-tools-next]$ patch -p1 < ./20250402_irogers_perf_pmu_avoid_segv_for_missing_name_alias_name_in_wildcarding.mbx patching file
tools/perf/util/pmu.c
Hunk #1 FAILED at 2060.
1 out of 1 hunk FAILED -- saving rejects to filetools/perf/util/pmu.c.rej
⬢ [acme@toolbx perf-tools-next]$⬢ [acme@toolbx perf-tools-next]$ cat
tools/perf/util/pmu.c.rejperf/util/pmu.c +3
-1@@ -2060,7 +2060,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))⬢ [acme@toolbx perf-tools-next]$
⬢ [acme@toolbx perf-tools-next]$ git log --oneline -5
tools/perf/util/pmu.c754baf426e099fbfperf pmu: Change aliases from list to hashmap255f5b6d060be5a4perf parse-events: Add "cpu" term to set the CPU an event is recorded onfa1332a8011eebe1perf mem/c2c amd: Add ldlat supportfc807b6bde6ad332perf pmu-events: Add retirement latency to JSON events inside of perf58b8b5d142a8bd5cperf cpumap: Increment reference count for online cpumap
⬢ [acme@toolbx perf-tools-next]$
Quoted 1 line
Can you please take a look?
Done.
https://lore.kernel.org/lkml/[email protected]/
Not sure what put patch off given the small nature of the change.
Thanks,
Ian
Quoted 1 line
- Arnaldo