From: Chen Wandun <chenwandun@huawei.com>
To: <acme@kernel.org>, <linux-kernel@vger.kernel.org>
Cc: <peterz@infradead.org>, <mingo@redhat.com>,
<cj.chengjian@huawei.com>, <chenwandun@huawei.com>
Subject: [PATCH next] perf tools: fix potential memleak in perf events parser
Date: Thu, 11 Jun 2020 09:42:34 +0800 [thread overview]
Message-ID: <20200611014234.24304-1-chenwandun@huawei.com> (raw)
Fix potential memory leak in function parse_events_term__sym_hw()
and parse_events_term__clone().
1. Free memory when errors occur.
2. Function new_term may return error, so it is need to free memory
when the return value is negative.
Signed-off-by: Chen Wandun <chenwandun@huawei.com>
---
tools/perf/util/parse-events.c | 40 +++++++++++++++++++++++++++++-----
1 file changed, 34 insertions(+), 6 deletions(-)
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 3decbb203846..3491c18edd71 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -2947,6 +2947,7 @@ int parse_events_term__sym_hw(struct parse_events_term **term,
.type_term = PARSE_EVENTS__TERM_TYPE_USER,
.config = config,
};
+ int ret;
if (!temp.config) {
temp.config = strdup("event");
@@ -2957,9 +2958,20 @@ 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);
+ }
+
+ ret = new_term(term, &temp, str, 0);
+ if (ret < 0) {
+ free(str);
+ if (!config)
+ free(temp.config);
+ }
+
+ return ret;
}
int parse_events_term__clone(struct parse_events_term **new,
@@ -2973,19 +2985,35 @@ int parse_events_term__clone(struct parse_events_term **new,
.err_term = term->err_term,
.err_val = term->err_val,
};
+ int ret;
if (term->config) {
temp.config = strdup(term->config);
if (!temp.config)
return -ENOMEM;
}
- if (term->type_val == PARSE_EVENTS__TERM_TYPE_NUM)
- return new_term(new, &temp, NULL, term->val.num);
+ if (term->type_val == PARSE_EVENTS__TERM_TYPE_NUM) {
+ ret = new_term(new, &temp, NULL, term->val.num);
+ if (ret < 0 && term->config)
+ free(temp.config);
+ return ret;
+ }
str = strdup(term->val.str);
- if (!str)
+ if (!str) {
+ if (term->config)
+ free(temp.config);
return -ENOMEM;
- return new_term(new, &temp, str, 0);
+ }
+
+ ret = new_term(new, &temp, str, 0);
+ if (ret < 0) {
+ free(str);
+ if (term->config)
+ free(temp.config);
+ }
+
+ return ret;
}
void parse_events_term__delete(struct parse_events_term *term)
--
2.17.1
next reply other threads:[~2020-06-11 1:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-11 1:42 Chen Wandun [this message]
2020-06-11 13:16 ` Arnaldo Carvalho de Melo
2020-06-11 15:05 ` Chen Wandun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200611014234.24304-1-chenwandun@huawei.com \
--to=chenwandun@huawei.com \
--cc=acme@kernel.org \
--cc=cj.chengjian@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®