Skip to content

Commit c878bea

Browse files
committed
ext4: filter out EXT4_FC_REPLAY from on-disk superblock field s_state
The EXT4_FC_REPLAY bit in sbi->s_mount_state is used to indicate that we are in the middle of replay the fast commit journal. This was actually a mistake, since the sbi->s_mount_info is initialized from es->s_state. Arguably s_mount_state is misleadingly named, but the name is historical --- s_mount_state and s_state dates back to ext2. What should have been used is the ext4_{set,clear,test}_mount_flag() inline functions, which sets EXT4_MF_* bits in sbi->s_mount_flags. The problem with using EXT4_FC_REPLAY is that a maliciously corrupted superblock could result in EXT4_FC_REPLAY getting set in s_mount_state. This bypasses some sanity checks, and this can trigger a BUG() in ext4_es_cache_extent(). As a easy-to-backport-fix, filter out the EXT4_FC_REPLAY bit for now. We should eventually transition away from EXT4_FC_REPLAY to something like EXT4_MF_REPLAY. Cc: [email protected] Signed-off-by: Theodore Ts'o <[email protected]> Link: https://lore.kernel.org/r/[email protected] Link: https://lore.kernel.org/r/[email protected] Reported-by: [email protected]
1 parent ef09ed5 commit c878bea

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

fs/ext4/super.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4770,7 +4770,7 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)
47704770
sbi->s_inodes_per_block;
47714771
sbi->s_desc_per_block = blocksize / EXT4_DESC_SIZE(sb);
47724772
sbi->s_sbh = bh;
4773-
sbi->s_mount_state = le16_to_cpu(es->s_state);
4773+
sbi->s_mount_state = le16_to_cpu(es->s_state) & ~EXT4_FC_REPLAY;
47744774
sbi->s_addr_per_block_bits = ilog2(EXT4_ADDR_PER_BLOCK(sb));
47754775
sbi->s_desc_per_block_bits = ilog2(EXT4_DESC_PER_BLOCK(sb));
47764776

@@ -6333,7 +6333,8 @@ static int __ext4_remount(struct fs_context *fc, struct super_block *sb)
63336333
if (err)
63346334
goto restore_opts;
63356335
}
6336-
sbi->s_mount_state = le16_to_cpu(es->s_state);
6336+
sbi->s_mount_state = (le16_to_cpu(es->s_state) &
6337+
~EXT4_FC_REPLAY);
63376338

63386339
err = ext4_setup_super(sb, es, 0);
63396340
if (err)

0 commit comments

Comments
 (0)