Commit 1eb217ab authored by Faisal Bukhari's avatar Faisal Bukhari Committed by Namhyung Kim
Browse files

perf parse-events: Fix evsel allocation failure 



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: cd63c221 ("perf parse-events: Minor __add_event refactoring")
Signed-off-by: default avatarFaisal Bukhari <faisalbukhari523@gmail.com>
Reviewed-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
parent fe072f65

tools/perf/util/parse-events.c

+5 −2
Original line number Diff line number Diff line
@@ -251,8 +251,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);