Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Subject: Re: [PATCH] perf jevents: Fix resource leak in process_mapfile()
To:     Yunfeng Ye <yeyunfeng@huawei.com>, <peterz@infradead.org>,
        <mingo@redhat.com>, <acme@kernel.org>, <mark.rutland@arm.com>,
        <alexander.shishkin@linux.intel.com>, <jolsa@redhat.com>,
        <namhyung@kernel.org>, <ak@linux.intel.com>,
        <lukemujica@google.com>, <kan.liang@linux.intel.com>,
        <yuzenghui@huawei.com>
References: <bf113089-e3cd-50f9-f7ed-17d07512a702@huawei.com>
 <87e66585-1564-3523-59f6-cab15b7e1717@huawei.com>
 <0cd0d259-e806-effd-5e44-fccd13842697@huawei.com>
CC:     <linux-kernel@vger.kernel.org>, <hushiyuan@huawei.com>,
        <linfeilong@huawei.com>
From:   John Garry <john.garry@huawei.com>
Message-ID: <5dcbcd6f-3789-69e1-b0c1-33416aa0790d@huawei.com>
Date:   Wed, 16 Oct 2019 13:08:48 +0100
User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101
 Thunderbird/45.3.0
MIME-Version: 1.0
In-Reply-To: <0cd0d259-e806-effd-5e44-fccd13842697@huawei.com>
Content-Type: text/plain; charset="utf-8"; format=flowed
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

>>> +            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)?

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;
>>>  }
>>>
>>>  /*
>>>
>>
>>
>>
>> .
>>
>
>
> .
>