]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
KVM: VMX: Switch __vmx_exit() and kvm_x86_vendor_exit() in vmx_exit()
authorKai Huang <kai.huang@intel.com>
Thu, 27 Jun 2024 01:05:24 +0000 (13:05 +1200)
committerSean Christopherson <seanjc@google.com>
Fri, 28 Jun 2024 15:58:23 +0000 (08:58 -0700)
In the vmx_init() error handling path, the __vmx_exit() is done before
kvm_x86_vendor_exit().  They should follow the same order in vmx_exit().

But currently __vmx_exit() is done after kvm_x86_vendor_exit() in
vmx_exit().  Switch the order of them to fix.

Fixes: e32b120071ea ("KVM: VMX: Do _all_ initialization before exposing /dev/kvm to userspace")
Signed-off-by: Kai Huang <kai.huang@intel.com>
Link: https://lore.kernel.org/r/20240627010524.3732488-1-kai.huang@intel.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
arch/x86/kvm/vmx/vmx.c

index 525765aaaf3a63e4357c82bbd9abe68afd6db3de..6643c2d5b3a0652b18243c8eec905b0bd10cab7d 100644 (file)
@@ -8626,9 +8626,9 @@ static void __vmx_exit(void)
 static void vmx_exit(void)
 {
        kvm_exit();
+       __vmx_exit();
        kvm_x86_vendor_exit();
 
-       __vmx_exit();
 }
 module_exit(vmx_exit);