2020-06-15 01:40:11

by Chen Wandun

Subject: [PATCH next v3 1/2] perf tools: fix potential memleak in perf events parser

From: Cheng Jian <[email protected]>

Fix memory leak of in function parse_events_term__sym_hw()
and parse_events_term__clone() when string duplication failed.

Fixes: b6645a723595 ("perf parse: Ensure config and str in terms are unique")
Signed-off-by: Cheng Jian <[email protected]>
Signed-off-by: Chen Wandun <[email protected]>
---
tools/perf/util/parse-events.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 3decbb203846..6f4dc8a92817 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -2957,8 +2957,12 @@ int parse_events_term__sym_hw(struct parse_events_term **term,
sym = &event_symbols_hw[idx];

str = strdup(sym->symbol);
- if (!str)
+ if (!str) {
+ if (!config)
+ free(temp.config);
return -ENOMEM;
+ }
+
return new_term(term, &temp, str, 0);
}

@@ -2983,8 +2987,12 @@ int parse_events_term__clone(struct parse_events_term **new,
return new_term(new, &temp, NULL, term->val.num);

str = strdup(term->val.str);
- if (!str)
+ if (!str) {
+ if (term->config)
+ free(temp.config);
return -ENOMEM;
+ }
+
return new_term(new, &temp, str, 0);
}

--
2.17.1

2020-06-15 08:50:02

by Markus Elfring

Subject: Re: [PATCH v3 1/2] perf tools: Fix potential memory leaks in perf events parser

> Fix memory leak of in function parse_events_term__sym_hw()
> and parse_events_term__clone() when string duplication failed.

Can a wording like “Fix memory leaks in …” be more appropriate for
the final commit message?
Would you find any other description variant more pleasing?

Regards,
Markus