Re: [PATCH] perf jevents: Fix resource leak in process_mapfile()

[Yunfeng Ye]

On 2019/10/16 20:08, John Garry wrote:
>>>> +ÂÂÂÂÂÂÂÂÂÂÂ ret = -1;
>>>> +ÂÂÂÂÂÂÂÂÂÂÂ goto out;
>>>
>>> There's a subtle change of behaviour here, i.e. now calling print_mapping_table_suffix(), but I don't think that it makes any difference.
>>>
>> yes, I know that "goto out" will run print_mapping_table_suffix(outfp), because the error path before is done like this.
>> so I think it should be use "goto out" to run run print_mapping_table_suffix(outfp).
>>
>>> However, does outfp remain open also in this case:
>>>
>> Because it has a comment that "Make build fail", so I am not handle the outfp, only modify the process_mapfile() function.
>>
>>> main(int argc, char *argv[])
>>> {
>>> ...
>>>
>>> if (process_mapfile(eventsfp, mapfile)) {
>>> ÂÂÂ pr_info("%s: Error processing mapfile %s\n", prog, mapfile);
>>> ÂÂÂ /* Make build fail */
>>> ÂÂÂ return 1;
>>> }
>>>
>>> return 0;
>>>
>>> empty_map:
>>> ÂÂÂ fclose(eventsfp);
>>> ÂÂÂ ...
>>> }
>>>
>>> I think that this code works on the basis that the program exits on any sort of error and releases resources automatically. Having said that, it is a good practice to tidy up.
>>>
>> I agree with you, when program exits, it will releases resources automatically. It's just to make the program clearer and more correct.
> 
> So can you make that change also (to close outfp)?
> 
ok, I will modify by adding fclose(eventsfp) on the error path, In addition, free_arch_std_events() is need too.

> Thanks,
> John
> 
>>
>>> John
>>>
>>>> ÂÂÂÂÂÂÂÂ }
>>>> ÂÂÂÂÂÂÂÂ 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;
>>>> Â}
>>>>
>>>> Â/*
>>>>
>>>
>>>
>>>
>>> .
>>>
>>
>>
>> .
>>
> 
> 
> 
> .
>