Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d339ced authored by Theodore Ts'o's avatar Theodore Ts'o Committed by Greg Kroah-Hartman
Browse files

ext4: fix possible leak of sbi->s_group_desc_leak in error path 



commit 9e463084cdb22e0b56b2dfbc50461020409a5fd3 upstream.

Fixes: bfe0a5f4 ("ext4: add more mount time checks of the superblock")
Reported-by: default avatarVasily Averin <vvs@virtuozzo.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Cc: stable@kernel.org # 4.18
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 64a3d537

fs/ext4/super.c

+8 −8
Original line number Diff line number Diff line
@@ -4074,6 +4074,14 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) 
	sbi->s_groups_count = blocks_count;

	sbi->s_blockfile_groups = min_t(ext4_group_t, sbi->s_groups_count,

			(EXT4_MAX_BLOCK_FILE_PHYS / EXT4_BLOCKS_PER_GROUP(sb)));

	if (((u64)sbi->s_groups_count * sbi->s_inodes_per_group) !=

	    le32_to_cpu(es->s_inodes_count)) {

		ext4_msg(sb, KERN_ERR, "inodes count not valid: %u vs %llu",

			 le32_to_cpu(es->s_inodes_count),

			 ((u64)sbi->s_groups_count * sbi->s_inodes_per_group));

		ret = -EINVAL;

		goto failed_mount;

	}

	db_count = (sbi->s_groups_count + EXT4_DESC_PER_BLOCK(sb) - 1) /

		   EXT4_DESC_PER_BLOCK(sb);

	if (ext4_has_feature_meta_bg(sb)) {
@@ -4093,14 +4101,6 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) 
		ret = -ENOMEM;

		goto failed_mount;

	}

	if (((u64)sbi->s_groups_count * sbi->s_inodes_per_group) !=

	    le32_to_cpu(es->s_inodes_count)) {

		ext4_msg(sb, KERN_ERR, "inodes count not valid: %u vs %llu",

			 le32_to_cpu(es->s_inodes_count),

			 ((u64)sbi->s_groups_count * sbi->s_inodes_per_group));

		ret = -EINVAL;

		goto failed_mount;

	}



	bgl_lock_init(sbi->s_blockgroup_lock);