Skip to content

Commit 1e1ef79

Browse files
Jiufei Xuejfvogel
authored andcommitted
fs: writeback: fix use-after-free in __mark_inode_dirty()
[ Upstream commit d02d2c98d25793902f65803ab853b592c7a96b29 ] An use-after-free issue occurred when __mark_inode_dirty() get the bdi_writeback that was in the progress of switching. CPU: 1 PID: 562 Comm: systemd-random- Not tainted 6.6.56-gb4403bd46a8e #1 ...... pstate: 60400005 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : __mark_inode_dirty+0x124/0x418 lr : __mark_inode_dirty+0x118/0x418 sp : ffffffc08c9dbbc0 ........ Call trace: __mark_inode_dirty+0x124/0x418 generic_update_time+0x4c/0x60 file_modified+0xcc/0xd0 ext4_buffered_write_iter+0x58/0x124 ext4_file_write_iter+0x54/0x704 vfs_write+0x1c0/0x308 ksys_write+0x74/0x10c __arm64_sys_write+0x1c/0x28 invoke_syscall+0x48/0x114 el0_svc_common.constprop.0+0xc0/0xe0 do_el0_svc+0x1c/0x28 el0_svc+0x40/0xe4 el0t_64_sync_handler+0x120/0x12c el0t_64_sync+0x194/0x198 Root cause is: systemd-random-seed kworker ---------------------------------------------------------------------- ___mark_inode_dirty inode_switch_wbs_work_fn spin_lock(&inode->i_lock); inode_attach_wb locked_inode_to_wb_and_lock_list get inode->i_wb spin_unlock(&inode->i_lock); spin_lock(&wb->list_lock) spin_lock(&inode->i_lock) inode_io_list_move_locked spin_unlock(&wb->list_lock) spin_unlock(&inode->i_lock) spin_lock(&old_wb->list_lock) inode_do_switch_wbs spin_lock(&inode->i_lock) inode->i_wb = new_wb spin_unlock(&inode->i_lock) spin_unlock(&old_wb->list_lock) wb_put_many(old_wb, nr_switched) cgwb_release old wb released wb_wakeup_delayed() accesses wb, then trigger the use-after-free issue Fix this race condition by holding inode spinlock until wb_wakeup_delayed() finished. Signed-off-by: Jiufei Xue <jiufei.xue@samsung.com> Link: https://lore.kernel.org/20250728100715.3863241-1-jiufei.xue@samsung.com Reviewed-by: Jan Kara <jack@suse.cz> Signed-off-by: Christian Brauner <brauner@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org> (cherry picked from commit e63052921f1b25a836feb1500b841bff7a4a0456) Signed-off-by: Harshit Mogalapalli <harshit.m.mogalapalli@oracle.com> Orabug: 38500632 CVE: CVE-2025-39866 Signed-off-by: Jack Vogel <jack.vogel@oracle.com>
1 parent 5290ba1 commit 1e1ef79

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

fs/fs-writeback.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2573,10 +2573,6 @@ void __mark_inode_dirty(struct inode *inode, int flags)
25732573
wakeup_bdi = inode_io_list_move_locked(inode, wb,
25742574
dirty_list);
25752575

2576-
spin_unlock(&wb->list_lock);
2577-
spin_unlock(&inode->i_lock);
2578-
trace_writeback_dirty_inode_enqueue(inode);
2579-
25802576
/*
25812577
* If this is the first dirty inode for this bdi,
25822578
* we have to wake-up the corresponding bdi thread
@@ -2586,6 +2582,11 @@ void __mark_inode_dirty(struct inode *inode, int flags)
25862582
if (wakeup_bdi &&
25872583
(wb->bdi->capabilities & BDI_CAP_WRITEBACK))
25882584
wb_wakeup_delayed(wb);
2585+
2586+
spin_unlock(&wb->list_lock);
2587+
spin_unlock(&inode->i_lock);
2588+
trace_writeback_dirty_inode_enqueue(inode);
2589+
25892590
return;
25902591
}
25912592
}

0 commit comments

Comments
 (0)