perf parse-events: fix 3 use after frees
Ian Rogers
reviewerPATCH v2 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'.
v2 frees the evsel->pmu_name avoiding a memory leak.
--- tools/perf/util/evsel.c | 1 + tools/perf/util/parse-events.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-)
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); }
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 4 lines · Ian Rogers
Reproducible with a clang asan build and then running perf test in particular 'Parse event definition strings'.
v2 frees the
evsel->pmu_nameavoiding a memory leak.
thanks,
jirka
Quoted 53 lines
Signed-off-by Ian Rogers <[email protected]>--- tools/perf/util/evsel.c | 1 + tools/perf/util/parse-events.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-)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); }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 6 lines · Ian Rogers
Reproducible with a clang asan build and then running perf test in particular 'Parse event definition strings'.
v2 frees the
evsel->pmu_nameavoiding a memory leak.Signed-off-by Ian Rogers <[email protected]>
thanks,
jirka
Quoted 51 lines
--- tools/perf/util/evsel.c | 1 + tools/perf/util/parse-events.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-)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); }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
Arnaldo Carvalho de Melo
AppliedEm Wed, Mar 18, 2020 at 11:28:27AM +0100, Jiri Olsa escreveu:
Quoted 9 lines · Ian Rogers
Quoted 6 lines
Reproducible with a clang asan build and then running perf test in particular 'Parse event definition strings'.
v2 frees the
evsel->pmu_nameavoiding a memory leak.Signed-off-by Ian Rogers <[email protected]>Acked-by Jiri Olsa <[email protected]>
Thanks, applied.
- Arnaldo
Quoted 55 lines
thanks,
jirkaQuoted 51 lines
--- tools/perf/util/evsel.c | 1 + tools/perf/util/parse-events.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-)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); }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
Signature · 1 line
- Arnaldo
[tip: perf/urgent] perf parse-events: Fix 3 use after frees found with clang ASAN
In reply to Ian RogersThe following commit has been merged into the perf/urgent branch of tip:
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: d4953f7ef1a2e87ef732823af35361404d13fea8 Gitweb: https://git.kernel.org/tip/d4953f7ef1a2e87ef732823af35361404d13fea8 Author: Ian Rogers <[email protected]> AuthorDate: Sat, 14 Mar 2020 10:03:56 -07:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Mon, 23 Mar 2020 11:08:29 -03:00
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'.
--- tools/perf/util/evsel.c | 1 + tools/perf/util/parse-events.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-)
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); }
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++; }