Skip to content

Commit b855695

Browse files
xshen053gregkh
authored andcommitted
ext4: fix timer use-after-free on failed mount
commit 0ce160c upstream. 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 Link: https://patch.msgid.link/20240715043336.98097-1-shenxiaxi26@gmail.com Signed-off-by: Theodore Ts'o <tytso@mit.edu> Cc: stable@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 230ee05 commit b855695

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

fs/ext4/super.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5634,8 +5634,8 @@ failed_mount8: __maybe_unused
56345634
failed_mount3:
56355635
/* flush s_sb_upd_work before sbi destroy */
56365636
flush_work(&sbi->s_sb_upd_work);
5637-
del_timer_sync(&sbi->s_err_report);
56385637
ext4_stop_mmpd(sbi);
5638+
del_timer_sync(&sbi->s_err_report);
56395639
ext4_group_desc_free(sbi);
56405640
failed_mount:
56415641
if (sbi->s_chksum_driver)

0 commit comments

Comments
 (0)