Commit 829fa70d authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

ext4: validate that metadata blocks do not overlap superblock 



A number of fuzzing failures seem to be caused by allocation bitmaps
or other metadata blocks being pointed at the superblock.

This can cause kernel BUG or WARNings once the superblock is
overwritten, so validate the group descriptor blocks to make sure this
doesn't happen.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 3980bd3b

fs/ext4/super.c

+17 −1
Original line number Diff line number Diff line
@@ -2211,6 +2211,7 @@ void ext4_group_desc_csum_set(struct super_block *sb, __u32 block_group, 


/* Called at mount-time, super-block is locked */

static int ext4_check_descriptors(struct super_block *sb,

				  ext4_fsblk_t sb_block,

				  ext4_group_t *first_not_zeroed)

{

	struct ext4_sb_info *sbi = EXT4_SB(sb);
@@ -2241,6 +2242,11 @@ static int ext4_check_descriptors(struct super_block *sb, 
			grp = i;



		block_bitmap = ext4_block_bitmap(sb, gdp);

		if (block_bitmap == sb_block) {

			ext4_msg(sb, KERN_ERR, "ext4_check_descriptors: "

				 "Block bitmap for group %u overlaps "

				 "superblock", i);

		}

		if (block_bitmap < first_block || block_bitmap > last_block) {

			ext4_msg(sb, KERN_ERR, "ext4_check_descriptors: "

			       "Block bitmap for group %u not in group "
@@ -2248,6 +2254,11 @@ static int ext4_check_descriptors(struct super_block *sb, 
			return 0;

		}

		inode_bitmap = ext4_inode_bitmap(sb, gdp);

		if (inode_bitmap == sb_block) {

			ext4_msg(sb, KERN_ERR, "ext4_check_descriptors: "

				 "Inode bitmap for group %u overlaps "

				 "superblock", i);

		}

		if (inode_bitmap < first_block || inode_bitmap > last_block) {

			ext4_msg(sb, KERN_ERR, "ext4_check_descriptors: "

			       "Inode bitmap for group %u not in group "
@@ -2255,6 +2266,11 @@ static int ext4_check_descriptors(struct super_block *sb, 
			return 0;

		}

		inode_table = ext4_inode_table(sb, gdp);

		if (inode_table == sb_block) {

			ext4_msg(sb, KERN_ERR, "ext4_check_descriptors: "

				 "Inode table for group %u overlaps "

				 "superblock", i);

		}

		if (inode_table < first_block ||

		    inode_table + sbi->s_itb_per_group - 1 > last_block) {

			ext4_msg(sb, KERN_ERR, "ext4_check_descriptors: "
@@ -3757,7 +3773,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) 
			goto failed_mount2;

		}

	}

	if (!ext4_check_descriptors(sb, &first_not_zeroed)) {

	if (!ext4_check_descriptors(sb, logical_sb_block, &first_not_zeroed)) {

		ext4_msg(sb, KERN_ERR, "group descriptors corrupted!");

		ret = -EFSCORRUPTED;

		goto failed_mount2;

CRA Git | Maintained and supported by SUSTech CRA and CCSE