ext4: avoid potential data overflow in next_linear_group
[ Upstream commit60c672b7f2
] ngroups is ext4_group_t (unsigned int) while next_linear_group treat it in int. If ngroups is bigger than max number described by int, it will be treat as a negative number. Then "return group + 1 >= ngroups ? 0 : group + 1;" may keep returning 0. Switch int to ext4_group_t in next_linear_group to fix the overflow. Fixes:196e402adf
("ext4: improve cr 0 / cr 1 group scanning") Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com> Reviewed-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com> Link: https://lore.kernel.org/r/20230801143204.2284343-3-shikemeng@huaweicloud.com Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
772ca4bc1d
commit
e0f5698757
|
@ -966,8 +966,9 @@ static inline int should_optimize_scan(struct ext4_allocation_context *ac)
|
||||||
* Return next linear group for allocation. If linear traversal should not be
|
* Return next linear group for allocation. If linear traversal should not be
|
||||||
* performed, this function just returns the same group
|
* performed, this function just returns the same group
|
||||||
*/
|
*/
|
||||||
static int
|
static ext4_group_t
|
||||||
next_linear_group(struct ext4_allocation_context *ac, int group, int ngroups)
|
next_linear_group(struct ext4_allocation_context *ac, ext4_group_t group,
|
||||||
|
ext4_group_t ngroups)
|
||||||
{
|
{
|
||||||
if (!should_optimize_scan(ac))
|
if (!should_optimize_scan(ac))
|
||||||
goto inc_and_return;
|
goto inc_and_return;
|
||||||
|
|
Loading…
Reference in New Issue