diff options
author | Marcelo Tosatti <mtosatti@redhat.com> | 2014-01-03 14:00:51 -0500 |
---|---|---|
committer | Marcelo Tosatti <mtosatti@redhat.com> | 2014-01-08 16:14:08 -0500 |
commit | 26a865f4aa8e66a6d94958de7656f7f1b03c6c56 (patch) | |
tree | fc16111cb9f5664f512b554321f9a796e75b8ed5 /arch/x86/kvm/vmx.c | |
parent | 96893977b8f732493815e7a2b552c37e1bb967e5 (diff) |
KVM: VMX: fix use after free of vmx->loaded_vmcs
After free_loaded_vmcs executes, the "loaded_vmcs" structure
is kfreed, and now vmx->loaded_vmcs points to a kfreed area.
Subsequent free_loaded_vmcs then attempts to manipulate
vmx->loaded_vmcs.
Switch the order to avoid the problem.
https://bugzilla.redhat.com/show_bug.cgi?id=1047892
Reviewed-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/x86/kvm/vmx.c')
-rw-r--r-- | arch/x86/kvm/vmx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 0abf8b783f19..7661eb171936 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c | |||
@@ -7390,8 +7390,8 @@ static void vmx_free_vcpu(struct kvm_vcpu *vcpu) | |||
7390 | struct vcpu_vmx *vmx = to_vmx(vcpu); | 7390 | struct vcpu_vmx *vmx = to_vmx(vcpu); |
7391 | 7391 | ||
7392 | free_vpid(vmx); | 7392 | free_vpid(vmx); |
7393 | free_nested(vmx); | ||
7394 | free_loaded_vmcs(vmx->loaded_vmcs); | 7393 | free_loaded_vmcs(vmx->loaded_vmcs); |
7394 | free_nested(vmx); | ||
7395 | kfree(vmx->guest_msrs); | 7395 | kfree(vmx->guest_msrs); |
7396 | kvm_vcpu_uninit(vcpu); | 7396 | kvm_vcpu_uninit(vcpu); |
7397 | kmem_cache_free(kvm_vcpu_cache, vmx); | 7397 | kmem_cache_free(kvm_vcpu_cache, vmx); |