Linux EXT4 FS development
 help / color / mirror / Atom feed
From: Jan Kara <jack@suse.cz>
To: Baokun Li <libaokun1@huawei.com>
Cc: linux-ext4@vger.kernel.org, tytso@mit.edu,
	adilger.kernel@dilger.ca, jack@suse.cz, ritesh.list@gmail.com,
	linux-kernel@vger.kernel.org, yi.zhang@huawei.com,
	yangerkun@huawei.com, yukuai3@huawei.com
Subject: Re: [PATCH 2/4] ext4: remove unnecessary check from alloc_flex_gd()
Date: Thu, 19 Oct 2023 13:24:34 +0200	[thread overview]
Message-ID: <20231019112434.epx7cl7okturn4xq@quack3> (raw)
In-Reply-To: <20231018114221.441526-3-libaokun1@huawei.com>

On Wed 18-10-23 19:42:19, Baokun Li wrote:
> In commit 967ac8af4475 ("ext4: fix potential integer overflow in
> alloc_flex_gd()"), an overflow check is added to alloc_flex_gd() to
> prevent the allocated memory from being smaller than expected due to
> the overflow. However, after kmalloc() is replaced with kmalloc_array()
> in commit 6da2ec56059c ("treewide: kmalloc() -> kmalloc_array()"), the
> kmalloc_array() function has an overflow check, so the above problem
> will not occur. Therefore, the extra check is removed.
> 
> Signed-off-by: Baokun Li <libaokun1@huawei.com>

Looks good. Feel free to add:

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

								Honza

> ---
>  fs/ext4/resize.c | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
> index c6d4539d4c1f..0a57b199883c 100644
> --- a/fs/ext4/resize.c
> +++ b/fs/ext4/resize.c
> @@ -236,10 +236,7 @@ static struct ext4_new_flex_group_data *alloc_flex_gd(unsigned int flexbg_size)
>  	if (flex_gd == NULL)
>  		goto out3;
>  
> -	if (flexbg_size >= UINT_MAX / sizeof(struct ext4_new_group_data))
> -		goto out2;
>  	flex_gd->count = flexbg_size;
> -
>  	flex_gd->groups = kmalloc_array(flexbg_size,
>  					sizeof(struct ext4_new_group_data),
>  					GFP_NOFS);
> -- 
> 2.31.1
> 
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR

  reply	other threads:[~2023-10-19 11:24 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-18 11:42 [PATCH 0/4] ext4: fix WARN_ON in alloc_flex_gd() Baokun Li
2023-10-18 11:42 ` [PATCH 1/4] ext4: unify the type of flexbg_size to unsigned int Baokun Li
2023-10-19 11:21   ` Jan Kara
2023-10-18 11:42 ` [PATCH 2/4] ext4: remove unnecessary check from alloc_flex_gd() Baokun Li
2023-10-19 11:24   ` Jan Kara [this message]
2023-10-18 11:42 ` [PATCH 3/4] ext4: avoid online resizing failures due to oversized flex bg Baokun Li
2023-10-19 11:44   ` Jan Kara
2023-10-18 11:42 ` [PATCH 4/4] ext4: reduce unnecessary memory allocation in alloc_flex_gd() Baokun Li
2023-10-19 11:57   ` Jan Kara
2023-10-19 12:03     ` Baokun Li

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231019112434.epx7cl7okturn4xq@quack3 \
    --to=jack@suse.cz \
    --cc=adilger.kernel@dilger.ca \
    --cc=libaokun1@huawei.com \
    --cc=linux-ext4@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=ritesh.list@gmail.com \
    --cc=tytso@mit.edu \
    --cc=yangerkun@huawei.com \
    --cc=yi.zhang@huawei.com \
    --cc=yukuai3@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox