Skip to content

Commit

Permalink
ext4: limit group search loop for non-extent files
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
Lachlan McIlroy authored and Brian Maly committed Feb 24, 2018
1 parent 176750b commit f24bc46
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion fs/ext4/mballoc.c
Original file line number Diff line number Diff line change
Expand Up @@ -2026,7 +2026,11 @@ ext4_mb_regular_allocator(struct ext4_allocation_context *ac)
group = ac->ac_g_ex.fe_group;

for (i = 0; i < ngroups; group++, i++) {
if (group == ngroups)
/*
* Artificially restricted ngroups for non-extent
* files makes group > ngroups possible on first loop.
*/
if (group >= ngroups)
group = 0;

/* This now checks without needing the buddy page */
Expand Down

0 comments on commit f24bc46

Please sign in to comment.