diff options
| author | Ido Yariv | 2016-10-21 18:39:57 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2016-10-28 11:35:21 +0200 |
| commit | bd768e146624cbec7122ed15dead8daa137d909d (patch) | |
| tree | 97cb14f789f62df6e85c5efad79f4d488df209ed /arch/x86/kvm/x86.c | |
| parent | kvm/x86: Show WRMSR data is in hex (diff) | |
| download | kernel-qcow2-linux-bd768e146624cbec7122ed15dead8daa137d909d.tar.gz kernel-qcow2-linux-bd768e146624cbec7122ed15dead8daa137d909d.tar.xz kernel-qcow2-linux-bd768e146624cbec7122ed15dead8daa137d909d.zip | |
KVM: x86: fix wbinvd_dirty_mask use-after-free
vcpu->arch.wbinvd_dirty_mask may still be used after freeing it,
corrupting memory. For example, the following call trace may set a bit
in an already freed cpu mask:
kvm_arch_vcpu_load
vcpu_load
vmx_free_vcpu_nested
vmx_free_vcpu
kvm_arch_vcpu_free
Fix this by deferring freeing of wbinvd_dirty_mask.
Cc: stable@vger.kernel.org
Signed-off-by: Ido Yariv <ido@wizery.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
Diffstat (limited to 'arch/x86/kvm/x86.c')
| -rw-r--r-- | arch/x86/kvm/x86.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 0b2087981c06..e954be8a3185 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -7410,10 +7410,12 @@ void kvm_put_guest_fpu(struct kvm_vcpu *vcpu) void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu) { + void *wbinvd_dirty_mask = vcpu->arch.wbinvd_dirty_mask; + kvmclock_reset(vcpu); - free_cpumask_var(vcpu->arch.wbinvd_dirty_mask); kvm_x86_ops->vcpu_free(vcpu); + free_cpumask_var(wbinvd_dirty_mask); } struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, |