Skip to content

Commit 43e8a8e

Browse files
jankaramehmetb0
authored andcommitted
ext4: don't set SB_RDONLY after filesystem errors
BugLink: https://bugs.launchpad.net/bugs/2097301 [ Upstream commit d3476f3dad4ad68ae5f6b008ea6591d1520da5d8 ] When the filesystem is mounted with errors=remount-ro, we were setting SB_RDONLY flag to stop all filesystem modifications. We knew this misses proper locking (sb->s_umount) and does not go through proper filesystem remount procedure but it has been the way this worked since early ext2 days and it was good enough for catastrophic situation damage mitigation. Recently, syzbot has found a way (see link) to trigger warnings in filesystem freezing because the code got confused by SB_RDONLY changing under its hands. Since these days we set EXT4_FLAGS_SHUTDOWN on the superblock which is enough to stop all filesystem modifications, modifying SB_RDONLY shouldn't be needed. So stop doing that. Link: https://lore.kernel.org/all/[email protected] Reported-by: Christian Brauner <[email protected]> Signed-off-by: Jan Kara <[email protected]> Reviewed-by: Christian Brauner <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Theodore Ts'o <[email protected]> Signed-off-by: Sasha Levin <[email protected]> CVE-2024-50191 Signed-off-by: Manuel Diewald <[email protected]> Signed-off-by: Koichiro Den <[email protected]>
1 parent 7058633 commit 43e8a8e

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

fs/ext4/super.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -751,11 +751,12 @@ static void ext4_handle_error(struct super_block *sb, bool force_ro, int error,
751751

752752
ext4_msg(sb, KERN_CRIT, "Remounting filesystem read-only");
753753
/*
754-
* Make sure updated value of ->s_mount_flags will be visible before
755-
* ->s_flags update
754+
* EXT4_FLAGS_SHUTDOWN was set which stops all filesystem
755+
* modifications. We don't set SB_RDONLY because that requires
756+
* sb->s_umount semaphore and setting it without proper remount
757+
* procedure is confusing code such as freeze_super() leading to
758+
* deadlocks and other problems.
756759
*/
757-
smp_wmb();
758-
sb->s_flags |= SB_RDONLY;
759760
}
760761

761762
static void update_super_work(struct work_struct *work)

0 commit comments

Comments
 (0)