Commit d4953f7e authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf parse-events: Fix 3 use after frees found with clang ASAN 



Reproducible with a clang asan build and then running perf test in
particular 'Parse event definition strings'.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Acked-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: clang-built-linux@googlegroups.com
Link: http://lore.kernel.org/lkml/20200314170356.62914-1-irogers@google.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 3442a9ec

tools/perf/util/evsel.c

+1 −0
Original line number Diff line number Diff line
@@ -1287,6 +1287,7 @@ void perf_evsel__exit(struct evsel *evsel) 
	perf_thread_map__put(evsel->core.threads);

	zfree(&evsel->group_name);

	zfree(&evsel->name);

	zfree(&evsel->pmu_name);

	perf_evsel__object.fini(evsel);

}

tools/perf/util/parse-events.c

+3 −3
Original line number Diff line number Diff line
@@ -1449,7 +1449,7 @@ int parse_events_add_pmu(struct parse_events_state *parse_state, 
		evsel = __add_event(list, &parse_state->idx, &attr, NULL, pmu, NULL,

				    auto_merge_stats, NULL);

		if (evsel) {

			evsel->pmu_name = name;

			evsel->pmu_name = name ? strdup(name) : NULL;

			evsel->use_uncore_alias = use_uncore_alias;

			return 0;

		} else {
@@ -1497,7 +1497,7 @@ int parse_events_add_pmu(struct parse_events_state *parse_state, 
		evsel->snapshot = info.snapshot;

		evsel->metric_expr = info.metric_expr;

		evsel->metric_name = info.metric_name;

		evsel->pmu_name = name;

		evsel->pmu_name = name ? strdup(name) : NULL;

		evsel->use_uncore_alias = use_uncore_alias;

		evsel->percore = config_term_percore(&evsel->config_terms);

	}
@@ -1547,7 +1547,7 @@ int parse_events_multi_pmu_add(struct parse_events_state *parse_state, 
				if (!parse_events_add_pmu(parse_state, list,

							  pmu->name, head,

							  true, true)) {

					pr_debug("%s -> %s/%s/\n", config,

					pr_debug("%s -> %s/%s/\n", str,

						 pmu->name, alias->str);

					ok++;

				}

CRA Git | Maintained and supported by SUSTech CRA and CCSE