]> git.hungrycats.org Git - linux/commitdiff
KVM: VMX: Preserve negative return value in vmx_handle_exit() with bus lock detected
authorXiaoyao Li <xiaoyao.li@intel.com>
Wed, 19 Aug 2026 09:49:00 +0000 (17:49 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Nov 2026 17:06:09 +0000 (12:06 -0500)
commit cef48693da1e964e9f192bfc16cd0ed287c48337 upstream.

Preserve the negative return value from __vmx_handle_exit() when a bus
lock is detected, instead of always overwriting it with 0.

The purpose of bus_lock_detected handling is to force a userspace exit to
inform userspace that a bus lock happened. The negative return value can
achieve this purpose, and changing the negative value to 0 fails to return
an error to userspace. So, preserve the negative return value.

Fixes: fe6b6bc802b4 ("KVM: VMX: Enable bus lock VM exit")
Cc: stable@vger.kernel.org
Reported-by: sashiko-bot@kernel.org
Closes: https://lore.kernel.org/all/20260805034602.5B2BB1F000E9@smtp.kernel.org/
Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
Link: https://patch.msgid.link/20260819094903.3060020-7-xiaoyao.li@intel.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/x86/kvm/vmx/vmx.c

index 11662ebdb7f6aa518dccfadbe928ad42482946db..2b50db2c633db93feab1bcdedfa163ce42bc4a99 100644 (file)
@@ -6645,11 +6645,12 @@ int vmx_handle_exit(struct kvm_vcpu *vcpu, fastpath_t exit_fastpath)
         * a bus lock in guest.
         */
        if (vmx_get_exit_reason(vcpu).bus_lock_detected) {
-               if (ret > 0)
+               if (ret > 0) {
                        vcpu->run->exit_reason = KVM_EXIT_X86_BUS_LOCK;
+                       ret = 0;
+               }
 
                vcpu->run->flags |= KVM_RUN_X86_BUS_LOCK;
-               return 0;
        }
        return ret;
 }