From: Markus Elfring <Markus.Elfring@web.de>
To: Chen Wandun <chenwandun@huawei.com>,
netdev@vger.kernel.org, bpf@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Yonghong Song <yhs@fb.com>,
Song Liu <songliubraving@fb.com>,
Peter Zijlstra <peterz@infradead.org>,
Adrian Hunter <adrian.hunter@intel.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Andrii Nakryiko <andriin@fb.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Cheng Jian <cj.chengjian@huawei.com>,
Daniel Borkmann <daniel@iogearbox.net>,
Ian Rogers <irogers@google.com>, Ingo Molnar <mingo@redhat.com>,
Jiri Olsa <jolsa@redhat.com>,
John Fastabend <john.fastabend@gmail.com>,
Leo Yan <leo.yan@linaro.org>, Mark Rutland <mark.rutland@arm.com>,
Martin KaFai Lau <kafai@fb.com>,
Namhyung Kim <namhyung@kernel.org>
Subject: Re: [PATCH] perf tools: Fix potential memory leak in perf events parser
Date: Thu, 11 Jun 2020 15:17:17 +0200 [thread overview]
Message-ID: <ea548157-5cb0-ffa7-9bd5-ff3f9c66b1de@web.de> (raw)
> Fix potential memory leak in function parse_events_term__sym_hw()
> and parse_events_term__clone().
Would you like to add the tag “Fixes” to the commit message?
…
> +++ b/tools/perf/util/parse-events.c
…
> @@ -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;
> }
…
How do you think about to add jump targets for a bit of
common exception handling code in these function implementations?
Regards,
Markus
next reply other threads:[~2020-06-11 13:18 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-11 13:17 Markus Elfring [this message]
2020-06-11 14:13 ` [PATCH] perf tools: Fix potential memory leak in perf events parser Greg KH
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=ea548157-5cb0-ffa7-9bd5-ff3f9c66b1de@web.de \
--to=markus.elfring@web.de \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=andriin@fb.com \
--cc=bpf@vger.kernel.org \
--cc=chenwandun@huawei.com \
--cc=cj.chengjian@huawei.com \
--cc=daniel@iogearbox.net \
--cc=irogers@google.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@redhat.com \
--cc=kafai@fb.com \
--cc=leo.yan@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=songliubraving@fb.com \
--cc=yhs@fb.com \
/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;
as well as URLs for NNTP newsgroup(s).