KVM: x86: Cancel pvclock_gtod_work on module removal
Nothing prevents the following:
pvclock_gtod_notify()
queue_work(system_long_wq, &pvclock_gtod_work);
...
remove_module(kvm);
...
work_queue_run()
pvclock_gtod_work() <- UAFDitto for any other operation on that workqueue list head which touches pvclock_gtod_work after module removal.
Cancel the work in kvm_arch_exit() to prevent that.
---
Found by inspection because of:
https://lkml.kernel.org/r/[email protected]
See also:
https://lkml.kernel.org/r/[email protected]
TL;DR: Scheduling work with tk_core.seq write held is a bad idea.
--- arch/x86/kvm/x86.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/kvm/x86.c +1 -0
@@ -8168,6 +8168,7 @@ void kvm_arch_exit(void)cpuhp_remove_state_nocalls (CPUHP_AP_X86_KVM_CLK_ONLINE );#ifdef CONFIG_X86_64 pvclock_gtod_unregister_notifier (&pvclock_gtod_notifier); +cancel_work_sync (&pvclock_gtod_work);#endif kvm_x86_ops.hardware_enable =NULL ;kvm_mmu_module_exit ();
Quoted 32 lines · Thomas Gleixner
Nothing prevents the following:
pvclock_gtod_notify() queue_work(system_long_wq, &pvclock_gtod_work); ... remove_module(kvm); ... work_queue_run() pvclock_gtod_work() <- UAFDitto for any other operation on that workqueue list head which touches
pvclock_gtod_workafter module removal.Cancel the work in
kvm_arch_exit()to prevent that.Fixes 16e8d74d2da9 ("KVM: x86: notifier for clocksource changes")Signed-off-by Thomas Gleixner <[email protected]>---
Found by inspection because of:https://lkml.kernel.org/r/[email protected] See also: https://lkml.kernel.org/r/[email protected]TL;DR: Scheduling work with tk_core.seq write held is a bad idea.
--- arch/x86/kvm/x86.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/kvm/x86.c void kvm_arch_exit(void) · line 8174
Quoted 7 lines
arch/x86/kvm/x86.c +1
-0@@ -8168,6 +8168,7 @@ void kvm_arch_exit(void)cpuhp_remove_state_nocalls (CPUHP_AP_X86_KVM_CLK_ONLINE );#ifdef CONFIG_X86_64 pvclock_gtod_unregister_notifier (&pvclock_gtod_notifier); +cancel_work_sync (&pvclock_gtod_work);#endif kvm_x86_ops.hardware_enable =NULL ;kvm_mmu_module_exit ();
Queued, thanks (with added Cc to stable).
Paolo