[PATCH] ext4: Fix timer use-after-free on failed mount

[PATCH] ext4: Fix timer use-after-free on failed mount

[Jan Kara]

When filesystem mount fails because of corrupted filesystem we first
cancel the s_err_report timer reminding fs errors every day and only
then we flush s_error_work. However s_error_work may report another fs
error and re-arm timer thus resulting in timer use-after-free. Fix the
problem by first flushing the work and only after that canceling the
s_err_report timer.

Reported-by: syzbot+628472a2aac693ab0fcd@syzkaller.appspotmail.com
Fixes: 2d01ddc86606 ("ext4: save error info to sb through journal if available")
CC: stable@vger.kernel.org
Signed-off-by: Jan Kara <jack@suse.cz>
---
 fs/ext4/super.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index ad34a37278cd..2e3d4c5c2eb4 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -5149,8 +5149,8 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
 failed_mount3a:
 	ext4_es_unregister_shrinker(sbi);
 failed_mount3:
-	del_timer_sync(&sbi->s_err_report);
 	flush_work(&sbi->s_error_work);
+	del_timer_sync(&sbi->s_err_report);
 	if (sbi->s_mmp_tsk)
 		kthread_stop(sbi->s_mmp_tsk);
 failed_mount2:
-- 
2.26.2

Re: [PATCH] ext4: Fix timer use-after-free on failed mount

[Theodore Ts'o]

On Mon, Mar 15, 2021 at 05:59:06PM +0100, Jan Kara wrote:
> When filesystem mount fails because of corrupted filesystem we first
> cancel the s_err_report timer reminding fs errors every day and only
> then we flush s_error_work. However s_error_work may report another fs
> error and re-arm timer thus resulting in timer use-after-free. Fix the
> problem by first flushing the work and only after that canceling the
> s_err_report timer.
> 
> Reported-by: syzbot+628472a2aac693ab0fcd@syzkaller.appspotmail.com
> Fixes: 2d01ddc86606 ("ext4: save error info to sb through journal if available")
> CC: stable@vger.kernel.org
> Signed-off-by: Jan Kara <jack@suse.cz>

Thanks, applied.

					- Ted

[PATCH] ext4: Fix timer use-after-free on failed mount

[Xiaxi Shen]

Syzbot has found an ODEBUG bug in ext4_fill_super

The del_timer_sync function cancels the s_err_report timer,
which reminds about filesystem errors daily. We should
guarantee the timer is no longer active before kfree(sbi).

When filesystem mounting fails, the flow goes to failed_mount3,
where an error occurs when ext4_stop_mmpd is called, causing
a read I/O failure. This triggers the ext4_handle_error function
that ultimately re-arms the timer,
leaving the s_err_report timer active before kfree(sbi) is called.

Fix the issue by canceling the s_err_report timer after calling ext4_stop_mmpd.

Signed-off-by: Xiaxi Shen <shenxiaxi26@gmail.com>
Reported-and-tested-by: syzbot+59e0101c430934bc9a36@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=59e0101c430934bc9a36
---
 fs/ext4/super.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index c682fb927b64..1b4b0d3d8889 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -5626,8 +5626,8 @@ failed_mount8: __maybe_unused
 failed_mount3:
 	/* flush s_sb_upd_work before sbi destroy */
 	flush_work(&sbi->s_sb_upd_work);
-	del_timer_sync(&sbi->s_err_report);
 	ext4_stop_mmpd(sbi);
+	del_timer_sync(&sbi->s_err_report);
 	ext4_group_desc_free(sbi);
 failed_mount:
 	if (sbi->s_chksum_driver)
-- 
2.34.1

Re: [PATCH] ext4: Fix timer use-after-free on failed mount

[Theodore Ts'o]

On Sun, 14 Jul 2024 21:33:36 -0700, Xiaxi Shen wrote:
> Syzbot has found an ODEBUG bug in ext4_fill_super
> 
> The del_timer_sync function cancels the s_err_report timer,
> which reminds about filesystem errors daily. We should
> guarantee the timer is no longer active before kfree(sbi).
> 
> When filesystem mounting fails, the flow goes to failed_mount3,
> where an error occurs when ext4_stop_mmpd is called, causing
> a read I/O failure. This triggers the ext4_handle_error function
> that ultimately re-arms the timer,
> leaving the s_err_report timer active before kfree(sbi) is called.
> 
> [...]

Applied, thanks!

[1/1] ext4: Fix timer use-after-free on failed mount
      commit: 0ce160c5bdb67081a62293028dc85758a8efb22a

Best regards,
-- 
Theodore Ts'o <tytso@mit.edu>