KVM: Drop user return notifier when disabling virtualization on a cpu
PATCH 1/1 KVM: Drop user return notifier when disabling virtualization on a cpu
This way, we don't leave a dangling notifier on cpu hotunplug or module unload. In particular, module unload leaves the notifier pointing into freed memory.
Signed-off-by Avi Kivity <[email protected]>
---
Please queue for 2.6.33 as well.
arch/x86/kvm/x86.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-)
arch/x86/kvm/x86.c +9 -0
@@ -201,6 +201,14 @@ void kvm_set_shared_msr(unsigned slot, u64 value) }EXPORT_SYMBOL_GPL (kvm_set_shared_msr); +static void drop_user_return_notifiers (void *ignore) +{ +struct kvm_shared_msrs *smsr = &__get_cpu_var (shared_msrs); + +if (smsr->registered) +kvm_on_user_return (&smsr->urn); +} +unsigned long segment_base (u16 selector) {struct descriptor_table gdt;
@@ -5004,6 +5012,7 @@ int kvm_arch_hardware_enable(void *garbage)void kvm_arch_hardware_disable (void *garbage) { kvm_x86_ops->hardware_disable (garbage); +drop_user_return_notifiers (garbage); }int kvm_arch_hardware_setup (void )
Signature · 1 line
1.6.5.2
Marcelo Tosatti
AppliedQuoted 5 lines · Avi Kivity
This way, we don't leave a dangling notifier on cpu hotunplug or module unload. In particular, module unload leaves the notifier pointing into freed memory.
Signed-off-by Avi Kivity <[email protected]>
Applied, thanks.