Skip to content

Commit 7b00f71

Browse files
author
CKI KWF Bot
committed
Merge: CVE-2025-39866: fs: writeback: fix use-after-free in __mark_inode_dirty()
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/7395 JIRA: https://issues.redhat.com/browse/RHEL-117209 CVE: CVE-2025-39866 ``` commit d02d2c9 Author: Jiufei Xue <jiufei.xue@samsung.com> Date: Mon Jul 28 18:07:15 2025 +0800 fs: writeback: fix use-after-free in __mark_inode_dirty() 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: CKI Backport Bot <cki-ci-bot+cki-gitlab-backport-bot@redhat.com> --- <small>Created 2025-09-24 18:57 UTC by backporter - [KWF FAQ](https://red.ht/kernel_workflow_doc) - [Slack #team-kernel-workflow](https://redhat-internal.slack.com/archives/C04LRUPMJQ5) - [Source](https://gitlab.com/cki-project/kernel-workflow/-/blob/main/webhook/utils/backporter.py) - [Documentation](https://gitlab.com/cki-project/kernel-workflow/-/blob/main/docs/README.backporter.md) - [Report an issue](https://issues.redhat.com/secure/CreateIssueDetails!init.jspa?pid=12334433&issuetype=1&priority=4&summary=backporter+webhook+issue&components=kernel-workflow+/+backporter)</small> Approved-by: Abhi Das <adas@redhat.com> Approved-by: Ian Kent <ikent@redhat.com> Approved-by: David Howells <dhowells@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
2 parents f3be0fd + 80494ab commit 7b00f71

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
@@ -2511,10 +2511,6 @@ void __mark_inode_dirty(struct inode *inode, int flags)
25112511
wakeup_bdi = inode_io_list_move_locked(inode, wb,
25122512
dirty_list);
25132513

2514-
spin_unlock(&wb->list_lock);
2515-
spin_unlock(&inode->i_lock);
2516-
trace_writeback_dirty_inode_enqueue(inode);
2517-
25182514
/*
25192515
* If this is the first dirty inode for this bdi,
25202516
* we have to wake-up the corresponding bdi thread
@@ -2524,6 +2520,11 @@ void __mark_inode_dirty(struct inode *inode, int flags)
25242520
if (wakeup_bdi &&
25252521
(wb->bdi->capabilities & BDI_CAP_WRITEBACK))
25262522
wb_wakeup_delayed(wb);
2523+
2524+
spin_unlock(&wb->list_lock);
2525+
spin_unlock(&inode->i_lock);
2526+
trace_writeback_dirty_inode_enqueue(inode);
2527+
25272528
return;
25282529
}
25292530
}

0 commit comments

Comments
 (0)