perf parse-events: fix 3 use after frees
Ian Rogers
reviewerPATCH 1/1 perf parse-events: fix 3 use after frees
Reproducible with a clang asan build and then running perf test in particular 'Parse event definition strings'.
--- tools/perf/util/parse-events.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/perf/util/parse-events.c +3 -3
@@ -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++; }
Signature · 1 line
2.25.1.481.gfbce0eb801-goog
Quoted 22 lines · Ian Rogers
Reproducible with a clang asan build and then running perf test in particular 'Parse event definition strings'.
Signed-off-by Ian Rogers <[email protected]>--- tools/perf/util/parse-events.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)tools/perf/util/parse-events.c +1
-1@@ -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 {
tools/perf/util/parse-events.c int parse_events_add_pmu(struct parse_events_state *parse_state, · line 1500
Quoted 5 lines
tools/perf/util/parse-events.c +1
-1@@ -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 ;
so it's pmu->name pointer.. does pmu get destroyed before the evsel? also should we free that then like below?
tools/perf/util/parse-events.c int parse_events_multi_pmu_add(struct parse_events_state *parse_state, · line 1550
Quoted 9 lines
tools/perf/util/parse-events.c +1
-1evsel->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,
nice catch ;-)
Quoted 6 lines
tools/perf/util/parse-events.c +0
-0pmu->name, alias->str); ok++; }Signature · 1 line
2.25.1.481.gfbce0eb801-goog
thanks,
jirka
---
tools/perf/util/evsel.c +1 -0
@@ -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); }
Ian Rogers
reviewerQuoted 62 lines · Jiri Olsa
Quoted 22 lines · Ian Rogers
Reproducible with a clang asan build and then running perf test in particular 'Parse event definition strings'.
Signed-off-by Ian Rogers <[email protected]>--- tools/perf/util/parse-events.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)tools/perf/util/parse-events.c +1
-1@@ -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 {tools/perf/util/parse-events.c int parse_events_add_pmu(struct parse_events_state *parse_state, · line 1500
Quoted 5 lines
tools/perf/util/parse-events.c +1
-1@@ -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 ;so it's
pmu->namepointer.. does pmu get destroyed before the evsel? also should we free that then like below?tools/perf/util/parse-events.c int parse_events_multi_pmu_add(struct parse_events_state *parse_state, · line 1550
Quoted 9 lines
tools/perf/util/parse-events.c +1
-1evsel->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,nice catch ;-)
Quoted 6 lines
tools/perf/util/parse-events.c +0
-1pmu->name, alias->str); ok++; } --2.25.1.481.gfbce0eb801-goog
thanks,
jirka---
tools/perf/util/evsel.c +0
-0
tools/perf/util/evsel.c void perf_evsel__exit(struct evsel *evsel) · line 1292
Quoted 6 lines
tools/perf/util/evsel.c +1
-0@@ -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); }
Agreed on the zfree! I'll upload a v2 with it. I've tested with address sanitizer in case of double frees, etc. I haven't yet fuzz tested the latest version of parse events, libfuzz detects memory leaks between iterations so I expect there will be future small patches like this coming.
Thanks,
Ian