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

Commit 7687f5ab authored by Zhang Yi's avatar Zhang Yi Committed by Greg Kroah-Hartman
Browse files

ext4: fix check to prevent false positive report of incorrect used inodes 



commit a149d2a5cabbf6507a7832a1c4fd2593c55fd450 upstream.

Commit <50122847> ("ext4: fix check to prevent initializing reserved
inodes") check the block group zero and prevent initializing reserved
inodes. But in some special cases, the reserved inode may not all belong
to the group zero, it may exist into the second group if we format
filesystem below.

  mkfs.ext4 -b 4096 -g 8192 -N 1024 -I 4096 /dev/sda

So, it will end up triggering a false positive report of a corrupted
file system. This patch fix it by avoid check reserved inodes if no free
inode blocks will be zeroed.

Cc: stable@kernel.org
Fixes: 50122847 ("ext4: fix check to prevent initializing reserved inodes")
Signed-off-by: default avatarZhang Yi <yi.zhang@huawei.com>
Suggested-by: default avatarJan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20210331121516.2243099-1-yi.zhang@huawei.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a921d014

fs/ext4/ialloc.c

+32 −16
Original line number Diff line number Diff line
@@ -1358,6 +1358,7 @@ int ext4_init_inode_table(struct super_block *sb, ext4_group_t group, 
	handle_t *handle;

	ext4_fsblk_t blk;

	int num, ret = 0, used_blks = 0;

	unsigned long used_inos = 0;



	/* This should not happen, but just to be sure check this */

	if (sb_rdonly(sb)) {
@@ -1388,15 +1389,13 @@ int ext4_init_inode_table(struct super_block *sb, ext4_group_t group, 
	 * used inodes so we need to skip blocks with used inodes in

	 * inode table.

	 */

	if (!(gdp->bg_flags & cpu_to_le16(EXT4_BG_INODE_UNINIT)))

		used_blks = DIV_ROUND_UP((EXT4_INODES_PER_GROUP(sb) -

			    ext4_itable_unused_count(sb, gdp)),

			    sbi->s_inodes_per_block);



	if ((used_blks < 0) || (used_blks > sbi->s_itb_per_group) ||

	    ((group == 0) && ((EXT4_INODES_PER_GROUP(sb) -

			       ext4_itable_unused_count(sb, gdp)) <

			      EXT4_FIRST_INO(sb)))) {

	if (!(gdp->bg_flags & cpu_to_le16(EXT4_BG_INODE_UNINIT))) {

		used_inos = EXT4_INODES_PER_GROUP(sb) -

			    ext4_itable_unused_count(sb, gdp);

		used_blks = DIV_ROUND_UP(used_inos, sbi->s_inodes_per_block);



		/* Bogus inode unused count? */

		if (used_blks < 0 || used_blks > sbi->s_itb_per_group) {

			ext4_error(sb, "Something is wrong with group %u: "

				   "used itable blocks: %d; "

				   "itable unused count: %u",
@@ -1406,6 +1405,23 @@ int ext4_init_inode_table(struct super_block *sb, ext4_group_t group, 
			goto err_out;

		}



		used_inos += group * EXT4_INODES_PER_GROUP(sb);

		/*

		 * Are there some uninitialized inodes in the inode table

		 * before the first normal inode?

		 */

		if ((used_blks != sbi->s_itb_per_group) &&

		     (used_inos < EXT4_FIRST_INO(sb))) {

			ext4_error(sb, "Something is wrong with group %u: "

				   "itable unused count: %u; "

				   "itables initialized count: %ld",

				   group, ext4_itable_unused_count(sb, gdp),

				   used_inos);

			ret = 1;

			goto err_out;

		}

	}



	blk = ext4_inode_table(sb, gdp) + used_blks;

	num = sbi->s_itb_per_group - used_blks;