Message-ID: <8fe8f1fd-b6ca-a8be-b899-b93d855e7748@paragon-software.com>
Date:   Tue, 23 Nov 2021 18:47:28 +0300
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.3.2
Subject: Re: [PATCH] fs/ntfs3: Fix some memory leaks in an error handling path
 of 'log_replay()'
Content-Language: en-US
To:     Christophe JAILLET <christophe.jaillet@wanadoo.fr>
CC:     <ntfs3@lists.linux.dev>, <linux-kernel@vger.kernel.org>,
        <kernel-janitors@vger.kernel.org>
References: <a2244abd11dc5f5ee8a0dcec97da33b75923facb.1636616693.git.christophe.jaillet@wanadoo.fr>
From:   Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
In-Reply-To: <a2244abd11dc5f5ee8a0dcec97da33b75923facb.1636616693.git.christophe.jaillet@wanadoo.fr>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 11.11.2021 10:45, Christophe JAILLET wrote:
> All error handling paths lead to 'out' where many resources are freed.
> 
> Do it as well here instead of a direct return, otherwise 'log', 'ra' and
> 'log->one_page_buf' (at least) will leak.
> 
> Fixes: b46acd6a6a62 ("fs/ntfs3: Add NTFS journal")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
>  fs/ntfs3/fslog.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/ntfs3/fslog.c b/fs/ntfs3/fslog.c
> index 06492f088d60..915f42cf07bc 100644
> --- a/fs/ntfs3/fslog.c
> +++ b/fs/ntfs3/fslog.c
> @@ -4085,8 +4085,10 @@ int log_replay(struct ntfs_inode *ni, bool *initialized)
>  		if (client == LFS_NO_CLIENT_LE) {
>  			/* Insert "NTFS" client LogFile. */
>  			client = ra->client_idx[0];
> -			if (client == LFS_NO_CLIENT_LE)
> -				return -EINVAL;
> +			if (client == LFS_NO_CLIENT_LE) {
> +				err = -EINVAL;
> +				goto out;
> +			}
>  
>  			t16 = le16_to_cpu(client);
>  			cr = ca + t16;
> 


Thanks for patch, applied!