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 <yeyunf...@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
>
