From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Baokun Li <libaokun1@huawei.com>, Jan Kara <jack@suse.cz>,
Theodore Ts'o <tytso@mit.edu>, Sasha Levin <sashal@kernel.org>,
adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org
Subject: [PATCH AUTOSEL 5.10 8/9] ext4: remove unnecessary check from alloc_flex_gd()
Date: Mon, 15 Jan 2024 20:07:52 -0500 [thread overview]
Message-ID: <20240116010757.219495-8-sashal@kernel.org> (raw)
In-Reply-To: <20240116010757.219495-1-sashal@kernel.org>
From: Baokun Li <libaokun1@huawei.com>
[ 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>
---
fs/ext4/resize.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
index 96d278688fd7..66ce3d118203 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);
--
2.43.0
next prev parent reply other threads:[~2024-01-16 1:08 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-16 1:07 [PATCH AUTOSEL 5.10 1/9] Hexagon: Make pfn accessors statics inlines Sasha Levin
2024-01-16 1:07 ` [PATCH AUTOSEL 5.10 2/9] s390/ptrace: handle setting of fpc register correctly Sasha Levin
2024-01-16 1:07 ` [PATCH AUTOSEL 5.10 3/9] KVM: s390: fix setting of fpc register Sasha Levin
2024-01-16 1:07 ` [PATCH AUTOSEL 5.10 4/9] SUNRPC: Fix a suspicious RCU usage warning Sasha Levin
2024-01-16 1:07 ` [PATCH AUTOSEL 5.10 5/9] ecryptfs: Reject casefold directory inodes Sasha Levin
2024-01-16 1:07 ` [PATCH AUTOSEL 5.10 6/9] ext4: fix inconsistent between segment fstrim and full fstrim Sasha Levin
2024-01-16 1:07 ` [PATCH AUTOSEL 5.10 7/9] ext4: unify the type of flexbg_size to unsigned int Sasha Levin
2024-01-16 1:07 ` Sasha Levin [this message]
2024-01-16 1:07 ` [PATCH AUTOSEL 5.10 9/9] ext4: avoid online resizing failures due to oversized flex bg Sasha Levin
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=20240116010757.219495-8-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=adilger.kernel@dilger.ca \
--cc=jack@suse.cz \
--cc=libaokun1@huawei.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=tytso@mit.edu \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.