summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorFaisal Bukhari <faisalbukhari523@gmail.com>2025-09-22 23:38:34 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2026-01-30 10:32:09 +0100
commit4f6884288e4b78efcd64c679973598c201d1db93 (patch)
tree27f1ece6aa75c046e815acdf98b638e6bb4f239f /tools
parent83eeeb8c1acb763b6f633678eb3dbf553208bcf6 (diff)
perf parse-events: Fix evsel allocation failure
[ Upstream commit 1eb217ab2e737609f8a861b517649e82e7236d05 ] If evsel__new_idx() returns NULL, the function currently jumps to label 'out_err'. Here, references to `cpus` and `pmu_cpus` are dropped. Also, resources held by evsel->name and evsel->metric_id are freed. But if evsel__new_idx() returns NULL, it can lead to NULL pointer dereference. Fixes: cd63c22168257a0b ("perf parse-events: Minor __add_event refactoring") Signed-off-by: Faisal Bukhari <faisalbukhari523@gmail.com> Reviewed-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Namhyung Kim <namhyung@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/util/parse-events.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index cd9315d3ca11..4723c2955f22 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -286,8 +286,11 @@ __add_event(struct list_head *list, int *idx,
event_attr_init(attr);
evsel = evsel__new_idx(attr, *idx);
- if (!evsel)
- goto out_err;
+ if (!evsel) {
+ perf_cpu_map__put(cpus);
+ perf_cpu_map__put(pmu_cpus);
+ return NULL;
+ }
if (name) {
evsel->name = strdup(name);