Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Message-ID: <2692afd4-f263-838a-a80e-e6f740d44f36@paragon-software.com>
Date:   Mon, 20 Sep 2021 19:12:56 +0300
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.1.1
Subject: Re: [PATCH][next] fs/ntfs3: Fix a memory leak on object opts
Content-Language: en-US
To:     Kari Argillander <kari.argillander@gmail.com>,
        Colin King <colin.king@canonical.com>
CC:     <ntfs3@lists.linux.dev>, <kernel-janitors@vger.kernel.org>,
        <linux-kernel@vger.kernel.org>
References: <20210910100202.29254-1-colin.king@canonical.com>
 <20210910105018.asvmzihjdqeqm25v@kari-VirtualBox>
From:   Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
In-Reply-To: <20210910105018.asvmzihjdqeqm25v@kari-VirtualBox>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 10.09.2021 13:50, Kari Argillander wrote:
> On Fri, Sep 10, 2021 at 11:02:02AM +0100, Colin King wrote:
>> From: Colin Ian King <colin.king@canonical.com>
>>
>> Currently a failed allocation on sbi->upcase will cause an exit via
>> the label free_sbi causing a memory leak on object opts. Fix this by
>> re-ordering the exit paths free_opts and free_sbi so that kfree's occur
>> in the reverse allocation order.
>>
>> Addresses-Coverity: ("Resource leak")
>> Fixes: 27fac77707a1 ("fs/ntfs3: Init spi more in init_fs_context than fill_super")
>> Signed-off-by: Colin Ian King <colin.king@canonical.com>
>> ---
> 
> Thanks Colin.
> 
> Reviewed-by: Kari Argillander <kari.argillander@gmail.com>
> 
>>  fs/ntfs3/super.c | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/fs/ntfs3/super.c b/fs/ntfs3/super.c
>> index 3cba0b5e7ac7..69f23db0d727 100644
>> --- a/fs/ntfs3/super.c
>> +++ b/fs/ntfs3/super.c
>> @@ -1450,10 +1450,10 @@ static int ntfs_init_fs_context(struct fs_context *fc)
>>  	fc->ops = &ntfs_context_ops;
>>  
>>  	return 0;
>> -free_opts:
>> -	kfree(opts);
>>  free_sbi:
>>  	kfree(sbi);
>> +free_opts:
>> +	kfree(opts);
>>  	return -ENOMEM;
>>  }
>>  
>> -- 
>> 2.32.0
>>

Hi, Colin, Kari!

Thanks for work - applied!