Commit a078dff8 authored by Jan Kara's avatar Jan Kara Committed by Theodore Ts'o
Browse files

ext4: fixup possible uninitialized variable access in ext4_mb_choose_next_group_cr1() 

Variable 'grp' may be left uninitialized if there's no group with
suitable average fragment size (or larger). Fix the problem by
initializing it earlier.

Link: https://lore.kernel.org/r/20220922091542.pkhedytey7wzp5fi@quack3


Fixes: 83e80a6e ("ext4: use buckets for cr 1 block scan instead of rbtree")
Cc: stable@kernel.org
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 80fa46d6

fs/ext4/mballoc.c

+1 −2
Original line number Diff line number Diff line
@@ -910,7 +910,7 @@ static void ext4_mb_choose_next_group_cr1(struct ext4_allocation_context *ac, 
		int *new_cr, ext4_group_t *group, ext4_group_t ngroups)

{

	struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);

	struct ext4_group_info *grp, *iter;

	struct ext4_group_info *grp = NULL, *iter;

	int i;



	if (unlikely(ac->ac_flags & EXT4_MB_CR1_OPTIMIZED)) {
@@ -927,7 +927,6 @@ static void ext4_mb_choose_next_group_cr1(struct ext4_allocation_context *ac, 
			read_unlock(&sbi->s_mb_avg_fragment_size_locks[i]);

			continue;

		}

		grp = NULL;

		list_for_each_entry(iter, &sbi->s_mb_avg_fragment_size[i],

				    bb_avg_fragment_size_node) {

			if (sbi->s_mb_stats)