From: Baokun Li Date: Mon, 23 Oct 2023 01:30:55 +0000 (+0800) Subject: ext4: remove unnecessary check from alloc_flex_gd() X-Git-Tag: v6.8-rc1~140^2~16 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b099eb87de105cf07cad731ded6fb40b2675108b;p=thirdparty%2Fkernel%2Flinux.git ext4: remove unnecessary check from alloc_flex_gd() 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 Reviewed-by: Jan Kara Link: https://lore.kernel.org/r/20231023013057.2117948-3-libaokun1@huawei.com Signed-off-by: Theodore Ts'o --- diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index c6d4539d4c1fa..0a57b199883ca 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);