From: Yunfeng Ye <yeyunfeng@huawei.com>
To: Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com>
Cc: <peterz@infradead.org>, <mingo@redhat.com>,
<mark.rutland@arm.com>, <alexander.shishkin@linux.intel.com>,
<jolsa@redhat.com>, <namhyung@kernel.org>,
<john.garry@huawei.com>, <ak@linux.intel.com>,
<lukemujica@google.com>, <kan.liang@linux.intel.com>,
<yuzenghui@huawei.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
<hushiyuan@huawei.com>, <linfeilong@huawei.com>
Subject: Re: [PATCH v2] perf jevents: Fix resource leak in process_mapfile() and main()
Date: Wed, 23 Oct 2019 16:22:25 +0800 [thread overview]
Message-ID: <b4aea0a8-f0a5-d439-e8c9-1b88841300be@huawei.com> (raw)
In-Reply-To: <20191016142536.GH22835@kernel.org>
On 2019/10/16 22:25, Arnaldo Carvalho de Melo wrote:
> Em Wed, Oct 16, 2019 at 09:50:17PM +0800, Yunfeng Ye escreveu:
>> There are memory leaks and file descriptor resource leaks in
>> process_mapfile() and main().
>>
>> Fix this by adding free(), fclose() and free_arch_std_events()
>> on the error paths.
>>
>> Fixes: 80eeb67fe577 ("perf jevents: Program to convert JSON file")
>> Fixes: 3f056b66647b ("perf jevents: Make build fail on JSON parse error")
>> Fixes: e9d32c1bf0cd ("perf vendor events: Add support for arch standard events")
>
> Nice, thanks for adding the fixes line, I looked at those three patches
> and indeed they were leaky, thanks for the fixes, we shouldn't have
> those leaks even if that, for now, makes the tool to end anyway.
>
The other 3 patchs have been applied, is this patch applied ? thanks.
> - Arnaldo
>
>> Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com>
>> ---
>> v1 -> v2:
>> - add free(eventsfp) to fix eventsfp resource leaks
>> - add free_arch_std_events() on the error path
>>
>> tools/perf/pmu-events/jevents.c | 13 +++++++++++--
>> 1 file changed, 11 insertions(+), 2 deletions(-)
>>
>> diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c
>> index e2837260ca4d..99e3fd04a5cb 100644
>> --- a/tools/perf/pmu-events/jevents.c
>> +++ b/tools/perf/pmu-events/jevents.c
>> @@ -758,6 +758,7 @@ static int process_mapfile(FILE *outfp, char *fpath)
>> char *line, *p;
>> int line_num;
>> char *tblname;
>> + int ret = 0;
>>
>> pr_info("%s: Processing mapfile %s\n", prog, fpath);
>>
>> @@ -769,6 +770,7 @@ static int process_mapfile(FILE *outfp, char *fpath)
>> if (!mapfp) {
>> pr_info("%s: Error %s opening %s\n", prog, strerror(errno),
>> fpath);
>> + free(line);
>> return -1;
>> }
>>
>> @@ -795,7 +797,8 @@ static int process_mapfile(FILE *outfp, char *fpath)
>> /* TODO Deal with lines longer than 16K */
>> pr_info("%s: Mapfile %s: line %d too long, aborting\n",
>> prog, fpath, line_num);
>> - return -1;
>> + ret = -1;
>> + goto out;
>> }
>> line[strlen(line)-1] = '\0';
>>
>> @@ -825,7 +828,9 @@ static int process_mapfile(FILE *outfp, char *fpath)
>>
>> out:
>> print_mapping_table_suffix(outfp);
>> - return 0;
>> + fclose(mapfp);
>> + free(line);
>> + return ret;
>> }
>>
>> /*
>> @@ -1122,6 +1127,7 @@ int main(int argc, char *argv[])
>> goto empty_map;
>> } else if (rc < 0) {
>> /* Make build fail */
>> + fclose(eventsfp);
>> free_arch_std_events();
>> return 1;
>> } else if (rc) {
>> @@ -1134,6 +1140,7 @@ int main(int argc, char *argv[])
>> goto empty_map;
>> } else if (rc < 0) {
>> /* Make build fail */
>> + fclose(eventsfp);
>> free_arch_std_events();
>> return 1;
>> } else if (rc) {
>> @@ -1151,6 +1158,8 @@ int main(int argc, char *argv[])
>> if (process_mapfile(eventsfp, mapfile)) {
>> pr_info("%s: Error processing mapfile %s\n", prog, mapfile);
>> /* Make build fail */
>> + fclose(eventsfp);
>> + free_arch_std_events();
>> return 1;
>> }
>>
>> --
>> 2.7.4.3
>
next prev parent reply other threads:[~2019-10-23 8:22 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-16 13:50 Yunfeng Ye
2019-10-16 14:25 ` Arnaldo Carvalho de Melo
2019-10-23 8:22 ` Yunfeng Ye [this message]
2019-10-24 13:48 ` Arnaldo Carvalho de Melo
2019-11-12 11:18 ` [tip: perf/core] " tip-bot2 for Yunfeng Ye
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=b4aea0a8-f0a5-d439-e8c9-1b88841300be@huawei.com \
--to=yeyunfeng@huawei.com \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=arnaldo.melo@gmail.com \
--cc=hushiyuan@huawei.com \
--cc=john.garry@huawei.com \
--cc=jolsa@redhat.com \
--cc=kan.liang@linux.intel.com \
--cc=linfeilong@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lukemujica@google.com \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=yuzenghui@huawei.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
all inboxes | Powered by JetHome®