linux-kernel - Re: [PATCH -next v2 1/3] ext4: fix potential memory leak in ext4_fc_record_modified

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20220921113106.mk4h4rjdfpwdkzs6@quack3>
Date:   Wed, 21 Sep 2022 13:31:06 +0200
From:   Jan Kara <jack@...e.cz>
To:     Ye Bin <yebin10@...wei.com>
Cc:     tytso@....edu, adilger.kernel@...ger.ca,
        linux-ext4@...r.kernel.org, linux-kernel@...r.kernel.org,
        jack@...e.cz
Subject: Re: [PATCH -next v2 1/3] ext4: fix potential memory leak in
 ext4_fc_record_modified_inode()

On Wed 21-09-22 14:40:38, Ye Bin wrote:
> As krealloc may return NULL, in this case 'state->fc_modified_inodes'
> may not be freed by krealloc, but 'state->fc_modified_inodes' already
> set NULL. Then will lead to 'state->fc_modified_inodes' memory leak.
> 
> Signed-off-by: Ye Bin <yebin10@...wei.com>

Still looks good to me. I think this didn't change since last time, did it?
Feel free to add:

Reviewed-by: Jan Kara <jack@...e.cz>

								Honza

> ---
>  fs/ext4/fast_commit.c | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/fs/ext4/fast_commit.c b/fs/ext4/fast_commit.c
> index 88575f3d0dc5..29a22ee0adb8 100644
> --- a/fs/ext4/fast_commit.c
> +++ b/fs/ext4/fast_commit.c
> @@ -1486,13 +1486,15 @@ static int ext4_fc_record_modified_inode(struct super_block *sb, int ino)
>  		if (state->fc_modified_inodes[i] == ino)
>  			return 0;
>  	if (state->fc_modified_inodes_used == state->fc_modified_inodes_size) {
> -		state->fc_modified_inodes = krealloc(
> -				state->fc_modified_inodes,
> +		int *fc_modified_inodes;
> +
> +		fc_modified_inodes = krealloc(state->fc_modified_inodes,
>  				sizeof(int) * (state->fc_modified_inodes_size +
>  				EXT4_FC_REPLAY_REALLOC_INCREMENT),
>  				GFP_KERNEL);
> -		if (!state->fc_modified_inodes)
> +		if (!fc_modified_inodes)
>  			return -ENOMEM;
> +		state->fc_modified_inodes = fc_modified_inodes;
>  		state->fc_modified_inodes_size +=
>  			EXT4_FC_REPLAY_REALLOC_INCREMENT;
>  	}
> -- 
> 2.31.1
> 
-- 
Jan Kara <jack@...e.com>
SUSE Labs, CR