* Re: [PATCH v2] perf parse-events: fix 3 use after frees
2020-03-14 17:03 [PATCH v2] perf parse-events: fix 3 use after frees Ian Rogers
@ 2020-03-15 9:30 ` Jiri Olsa
2020-03-18 10:28 ` Jiri Olsa
2020-04-04 8:42 ` [tip: perf/urgent] perf parse-events: Fix 3 use after frees found with clang ASAN tip-bot2 for Ian Rogers
2 siblings, 0 replies; 5+ messages in thread
From: Jiri Olsa @ 2020-03-15 9:30 UTC (permalink / raw)
To: Ian Rogers
Cc: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
Mark Rutland, Alexander Shishkin, Namhyung Kim, Andi Kleen,
Adrian Hunter, Leo Yan, linux-kernel, clang-built-linux,
Stephane Eranian
On Sat, Mar 14, 2020 at 10:03:56AM -0700, Ian Rogers wrote:
> 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.
Acked-by: Jiri Olsa <jolsa@redhat.com>
thanks,
jirka
>
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
> tools/perf/util/evsel.c | 1 +
> tools/perf/util/parse-events.c | 6 +++---
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
> index 816d930d774e..15ccd193483f 100644
> --- a/tools/perf/util/evsel.c
> +++ b/tools/perf/util/evsel.c
> @@ -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);
> }
>
> diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
> index a14995835d85..593b6b03785d 100644
> --- a/tools/perf/util/parse-events.c
> +++ b/tools/perf/util/parse-events.c
> @@ -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++;
> }
> --
> 2.25.1.481.gfbce0eb801-goog
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v2] perf parse-events: fix 3 use after frees
2020-03-14 17:03 [PATCH v2] perf parse-events: fix 3 use after frees Ian Rogers
2020-03-15 9:30 ` Jiri Olsa
@ 2020-03-18 10:28 ` Jiri Olsa
2020-03-18 13:47 ` Arnaldo Carvalho de Melo
2020-04-04 8:42 ` [tip: perf/urgent] perf parse-events: Fix 3 use after frees found with clang ASAN tip-bot2 for Ian Rogers
2 siblings, 1 reply; 5+ messages in thread
From: Jiri Olsa @ 2020-03-18 10:28 UTC (permalink / raw)
To: Ian Rogers
Cc: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
Mark Rutland, Alexander Shishkin, Namhyung Kim, Andi Kleen,
Adrian Hunter, Leo Yan, linux-kernel, clang-built-linux,
Stephane Eranian
On Sat, Mar 14, 2020 at 10:03:56AM -0700, Ian Rogers wrote:
> 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.
>
> Signed-off-by: Ian Rogers <irogers@google.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
thanks,
jirka
> ---
> tools/perf/util/evsel.c | 1 +
> tools/perf/util/parse-events.c | 6 +++---
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
> index 816d930d774e..15ccd193483f 100644
> --- a/tools/perf/util/evsel.c
> +++ b/tools/perf/util/evsel.c
> @@ -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);
> }
>
> diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
> index a14995835d85..593b6b03785d 100644
> --- a/tools/perf/util/parse-events.c
> +++ b/tools/perf/util/parse-events.c
> @@ -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++;
> }
> --
> 2.25.1.481.gfbce0eb801-goog
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v2] perf parse-events: fix 3 use after frees
2020-03-18 10:28 ` Jiri Olsa
@ 2020-03-18 13:47 ` Arnaldo Carvalho de Melo
0 siblings, 0 replies; 5+ messages in thread
From: Arnaldo Carvalho de Melo @ 2020-03-18 13:47 UTC (permalink / raw)
To: Jiri Olsa
Cc: Ian Rogers, Peter Zijlstra, Ingo Molnar, Mark Rutland,
Alexander Shishkin, Namhyung Kim, Andi Kleen, Adrian Hunter,
Leo Yan, linux-kernel, clang-built-linux, Stephane Eranian
Em Wed, Mar 18, 2020 at 11:28:27AM +0100, Jiri Olsa escreveu:
> On Sat, Mar 14, 2020 at 10:03:56AM -0700, Ian Rogers wrote:
> > 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.
> >
> > Signed-off-by: Ian Rogers <irogers@google.com>
>
> Acked-by: Jiri Olsa <jolsa@redhat.com>
Thanks, applied.
- Arnaldo
> thanks,
> jirka
>
> > ---
> > tools/perf/util/evsel.c | 1 +
> > tools/perf/util/parse-events.c | 6 +++---
> > 2 files changed, 4 insertions(+), 3 deletions(-)
> >
> > diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
> > index 816d930d774e..15ccd193483f 100644
> > --- a/tools/perf/util/evsel.c
> > +++ b/tools/perf/util/evsel.c
> > @@ -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);
> > }
> >
> > diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
> > index a14995835d85..593b6b03785d 100644
> > --- a/tools/perf/util/parse-events.c
> > +++ b/tools/perf/util/parse-events.c
> > @@ -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++;
> > }
> > --
> > 2.25.1.481.gfbce0eb801-goog
> >
>
--
- Arnaldo
^ permalink raw reply [flat|nested] 5+ messages in thread
* [tip: perf/urgent] perf parse-events: Fix 3 use after frees found with clang ASAN
2020-03-14 17:03 [PATCH v2] perf parse-events: fix 3 use after frees Ian Rogers
2020-03-15 9:30 ` Jiri Olsa
2020-03-18 10:28 ` Jiri Olsa
@ 2020-04-04 8:42 ` tip-bot2 for Ian Rogers
2 siblings, 0 replies; 5+ messages in thread
From: tip-bot2 for Ian Rogers @ 2020-04-04 8:42 UTC (permalink / raw)
To: linux-tip-commits
Cc: Ian Rogers, Jiri Olsa, Adrian Hunter, Alexander Shishkin,
Andi Kleen, Leo Yan, Mark Rutland, Namhyung Kim, Peter Zijlstra,
Stephane Eranian, clang-built-linux, Arnaldo Carvalho de Melo,
x86, LKML
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 <irogers@google.com>
AuthorDate: Sat, 14 Mar 2020 10:03:56 -07:00
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
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'.
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>
---
tools/perf/util/evsel.c | 1 +
tools/perf/util/parse-events.c | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 816d930..15ccd19 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -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);
}
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index a7dc0b0..1010774 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -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++;
}
^ permalink raw reply related [flat|nested] 5+ messages in thread