diff options
| author | Baokun Li <libaokun1@huawei.com> | 2023-10-23 09:30:55 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-02-23 08:12:46 +0100 |
| commit | b92f5db0fb2c8e666dcd1c41be2c38eae5d50898 (patch) | |
| tree | e62374e18d4e23ab97be47c86acc0d5b53be3109 | |
| parent | 17c04def41743d01067a4c347b2d429f847c28c3 (diff) | |
| download | linux-stable-b92f5db0fb2c8e666dcd1c41be2c38eae5d50898.tar.gz linux-stable-b92f5db0fb2c8e666dcd1c41be2c38eae5d50898.tar.bz2 linux-stable-b92f5db0fb2c8e666dcd1c41be2c38eae5d50898.zip | |
ext4: remove unnecessary check from alloc_flex_gd()
[ Upstream commit b099eb87de105cf07cad731ded6fb40b2675108b ]
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>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20231023013057.2117948-3-libaokun1@huawei.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | fs/ext4/resize.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index 2d27d4e06f7b..d9a8742873c9 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -245,10 +245,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); |