Skip to content

Commit f24bc46

Browse files
Lachlan McIlroyBrian Maly
Lachlan McIlroy
authored and
Brian Maly
committed
ext4: limit group search loop for non-extent files
Orabug: 17488415 commit e615573 upstream. In the case where we are allocating for a non-extent file, we must limit the groups we allocate from to those below 2^32 blocks, and ext4_mb_regular_allocator() attempts to do this initially by putting a cap on ngroups for the subsequent search loop. However, the initial target group comes in from the allocation context (ac), and it may already be beyond the artificially limited ngroups. In this case, the limit if (group == ngroups) group = 0; at the top of the loop is never true, and the loop will run away. Catch this case inside the loop and reset the search to start at group 0. [[email protected]: add commit msg & comments] Signed-off-by: Lachlan McIlroy <[email protected]> Signed-off-by: Eric Sandeen <[email protected]> Signed-off-by: "Theodore Ts'o" <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit 7fb7465071b6f553c5c5cd8aca704cfc6896917c) Signed-off-by: Todd Vierling <[email protected]> Acked-by: John Haxby <[email protected]> Signed-off-by: Brian Maly <[email protected]>
1 parent 176750b commit f24bc46

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

fs/ext4/mballoc.c

+5-1
Original file line numberDiff line numberDiff line change
@@ -2026,7 +2026,11 @@ ext4_mb_regular_allocator(struct ext4_allocation_context *ac)
20262026
group = ac->ac_g_ex.fe_group;
20272027

20282028
for (i = 0; i < ngroups; group++, i++) {
2029-
if (group == ngroups)
2029+
/*
2030+
* Artificially restricted ngroups for non-extent
2031+
* files makes group > ngroups possible on first loop.
2032+
*/
2033+
if (group >= ngroups)
20302034
group = 0;
20312035

20322036
/* This now checks without needing the buddy page */

0 commit comments

Comments
 (0)