KVM: nVMX: Free the VMREAD/VMWRITE bitmaps if alloc_kvm_area() fails

commit 1b3ab5ad1b8ad99bae76ec583809c5f5a31c707c upstream.

Fixes: 34a1cd60d17f ("kvm: x86: vmx: move some vmx setting from vmx_init() to hardware_setup()")
Cc: stable@vger.kernel.org
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 8eec37d37c3d1e20ce54d813b4ad33c9d14fc954..16bb8e35605eac445cbcffb11c43075e2a198f52 100644 (file)
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -7275,13 +7275,16 @@ static __init int hardware_setup(void)
 
        kvm_mce_cap_supported |= MCG_LMCE_P;
 
-       return alloc_kvm_area();
+       r = alloc_kvm_area();
+       if (r)
+               goto out;
+       return 0;
 
 out:
        for (i = 0; i < VMX_BITMAP_NR; i++)
                free_page((unsigned long)vmx_bitmap[i]);
 
-    return r;
+       return r;
 }
 
 static __exit void hardware_unsetup(void)