Commit 4f97a681 authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

ext4: fix support for inode sizes > 1024 bytes 

A recent commit, 9803387c ("ext4: validate the
debug_want_extra_isize mount option at parse time"), moved mount-time
checks around.  One of those changes moved the inode size check before
the blocksize variable was set to the blocksize of the file system.
After 9803387c was set to the minimum allowable blocksize, which
in practice on most systems would be 1024 bytes.  This cuased file
systems with inode sizes larger than 1024 bytes to be rejected with a
message:

EXT4-fs (sdXX): unsupported inode size: 4096

Fixes: 9803387c ("ext4: validate the debug_want_extra_isize mount option at parse time")
Link: https://lore.kernel.org/r/20200206225252.GA3673@mit.edu


Reported-by: default avatarHerbert Poetzl <herbert@13thfloor.at>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Cc: stable@kernel.org
parent 46d36880

fs/ext4/super.c

+10 −8
Original line number Diff line number Diff line
@@ -3814,6 +3814,15 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) 
	 */

	sbi->s_li_wait_mult = EXT4_DEF_LI_WAIT_MULT;



	blocksize = BLOCK_SIZE << le32_to_cpu(es->s_log_block_size);

	if (blocksize < EXT4_MIN_BLOCK_SIZE ||

	    blocksize > EXT4_MAX_BLOCK_SIZE) {

		ext4_msg(sb, KERN_ERR,

		       "Unsupported filesystem blocksize %d (%d log_block_size)",

			 blocksize, le32_to_cpu(es->s_log_block_size));

		goto failed_mount;

	}



	if (le32_to_cpu(es->s_rev_level) == EXT4_GOOD_OLD_REV) {

		sbi->s_inode_size = EXT4_GOOD_OLD_INODE_SIZE;

		sbi->s_first_ino = EXT4_GOOD_OLD_FIRST_INO;
@@ -3831,6 +3840,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) 
			ext4_msg(sb, KERN_ERR,

			       "unsupported inode size: %d",

			       sbi->s_inode_size);

			ext4_msg(sb, KERN_ERR, "blocksize: %d", blocksize);

			goto failed_mount;

		}

		/*
@@ -4033,14 +4043,6 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) 
	if (!ext4_feature_set_ok(sb, (sb_rdonly(sb))))

		goto failed_mount;



	blocksize = BLOCK_SIZE << le32_to_cpu(es->s_log_block_size);

	if (blocksize < EXT4_MIN_BLOCK_SIZE ||

	    blocksize > EXT4_MAX_BLOCK_SIZE) {

		ext4_msg(sb, KERN_ERR,

		       "Unsupported filesystem blocksize %d (%d log_block_size)",

			 blocksize, le32_to_cpu(es->s_log_block_size));

		goto failed_mount;

	}

	if (le32_to_cpu(es->s_log_block_size) >

	    (EXT4_MAX_BLOCK_LOG_SIZE - EXT4_MIN_BLOCK_LOG_SIZE)) {

		ext4_msg(sb, KERN_ERR,

CRA Git | Maintained and supported by SUSTech CRA and CCSE