* [PATCH] perf parse-events: Avoid free on non malloc-ed memory
@ 2020-05-12 23:52 Ian Rogers
2020-05-13 13:31 ` Arnaldo Carvalho de Melo
0 siblings, 1 reply; 2+ messages in thread
From: Ian Rogers @ 2020-05-12 23:52 UTC (permalink / raw)
To: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim,
Adrian Hunter, Leo Yan, Jin Yao, linux-kernel
Cc: Stephane Eranian, Ian Rogers
Caught by libfuzzer, there is a segfault with:
$ perf stat -e i/bs,tsc,L2/o sleep 1
As a config_term is added that isn't a string.
Fixes: e8dfb81838b1 (perf parse-events: Fix memory leaks found on parse_events)
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/parse-events.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index e9464b04f149..e37a6a3e6217 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -1480,7 +1480,8 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,
list_for_each_entry_safe(pos, tmp, &config_terms, list) {
list_del_init(&pos->list);
- zfree(&pos->val.str);
+ if (pos->free_str)
+ zfree(&pos->val.str);
free(pos);
}
return -EINVAL;
--
2.26.2.645.ge9eca65c58-goog
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] perf parse-events: Avoid free on non malloc-ed memory
2020-05-12 23:52 [PATCH] perf parse-events: Avoid free on non malloc-ed memory Ian Rogers
@ 2020-05-13 13:31 ` Arnaldo Carvalho de Melo
0 siblings, 0 replies; 2+ messages in thread
From: Arnaldo Carvalho de Melo @ 2020-05-13 13:31 UTC (permalink / raw)
To: Ian Rogers
Cc: Peter Zijlstra, Ingo Molnar, Mark Rutland, Alexander Shishkin,
Jiri Olsa, Namhyung Kim, Adrian Hunter, Leo Yan, Jin Yao,
linux-kernel, Stephane Eranian
Em Tue, May 12, 2020 at 04:52:02PM -0700, Ian Rogers escreveu:
> Caught by libfuzzer, there is a segfault with:
> $ perf stat -e i/bs,tsc,L2/o sleep 1
> As a config_term is added that isn't a string.
Yeah, I've just applied a similar patch after looking at your private
report, added the same fixes, used your reproducer,
Thanks,
- Arnaldo
> Fixes: e8dfb81838b1 (perf parse-events: Fix memory leaks found on parse_events)
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
> tools/perf/util/parse-events.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
> index e9464b04f149..e37a6a3e6217 100644
> --- a/tools/perf/util/parse-events.c
> +++ b/tools/perf/util/parse-events.c
> @@ -1480,7 +1480,8 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,
>
> list_for_each_entry_safe(pos, tmp, &config_terms, list) {
> list_del_init(&pos->list);
> - zfree(&pos->val.str);
> + if (pos->free_str)
> + zfree(&pos->val.str);
> free(pos);
> }
> return -EINVAL;
> --
> 2.26.2.645.ge9eca65c58-goog
>
--
- Arnaldo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-05-13 13:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-12 23:52 [PATCH] perf parse-events: Avoid free on non malloc-ed memory Ian Rogers
2020-05-13 13:31 ` Arnaldo Carvalho de Melo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).