Skip to content

Commit da84b30

Browse files
tytsoopsiff
authored andcommitted
ext4: handle wraparound when searching for blocks for indirect mapped blocks
[ Upstream commit bb81702370fad22c06ca12b6e1648754dbc37e0f ] Commit 4865c76 ("ext4: always allocate blocks only from groups inode can use") restricts what blocks will be allocated for indirect block based files to block numbers that fit within 32-bit block numbers. However, when using a review bot running on the latest Gemini LLM to check this commit when backporting into an LTS based kernel, it raised this concern: If ac->ac_g_ex.fe_group is >= ngroups (for instance, if the goal group was populated via stream allocation from s_mb_last_groups), then start will be >= ngroups. Does this allow allocating blocks beyond the 32-bit limit for indirect block mapped files? The commit message mentions that ext4_mb_scan_groups_linear() takes care to not select unsupported groups. However, its loop uses group = *start, and the very first iteration will call ext4_mb_scan_group() with this unsupported group because next_linear_group() is only called at the end of the iteration. After reviewing the code paths involved and considering the LLM review, I determined that this can happen when there is a file system where some files/directories are extent-mapped and others are indirect-block mapped. To address this, add a safety clamp in ext4_mb_scan_groups(). Fixes: 4865c76 ("ext4: always allocate blocks only from groups inode can use") Cc: Jan Kara <jack@suse.cz> Reviewed-by: Baokun Li <libaokun@linux.alibaba.com> Reviewed-by: Jan Kara <jack@suse.cz> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Link: https://patch.msgid.link/20260326045834.1175822-1-tytso@mit.edu Signed-off-by: Theodore Ts'o <tytso@mit.edu> Cc: stable@kernel.org Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit 83170a05908b6cf2fb3235d3065bf613ff866f3c) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
1 parent 20bc8a3 commit da84b30

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

fs/ext4/mballoc.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2887,6 +2887,8 @@ ext4_mb_regular_allocator(struct ext4_allocation_context *ac)
28872887
* from the goal value specified
28882888
*/
28892889
group = ac->ac_g_ex.fe_group;
2890+
if (group >= ngroups)
2891+
group = 0;
28902892
ac->ac_groups_linear_remaining = sbi->s_mb_max_linear_groups;
28912893
prefetch_grp = group;
28922894

0 commit comments

Comments
 (0)