mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-22 02:20:40 +00:00
perf parse-events: Fix 3 use after frees found with clang ASAN
[ Upstream commit d4953f7ef1
]
Reproducible with a clang asan build and then running perf test in
particular 'Parse event definition strings'.
Signed-off-by: Ian Rogers <irogers@google.com>
Acked-by: Jiri 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: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
048892dfab
commit
98c921e6be
2 changed files with 3 additions and 2 deletions
|
@ -1254,6 +1254,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);
|
||||
}
|
||||
|
||||
|
|
|
@ -1344,7 +1344,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 {
|
||||
|
@ -1385,7 +1385,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);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue