summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2025-07-24 01:04:27 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2025-07-24 01:04:27 +0300
commitf9af7b5d9349bf92cc4d0a0baa8a151295f12f4b (patch)
tree8597ea07099b082acc224bcaa8a1c7ac12ca8a2a /arch/x86
parent01a412d06bc5786eb4e44a6c8f0f4659bd4c9864 (diff)
parent5a53249d149f48b558368c5338b9921b76a12f8c (diff)
downloadlinux-f9af7b5d9349bf92cc4d0a0baa8a151295f12f4b.tar.xz
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull kvm fix from Paolo Bonzini: - Fix cleanup mistake (probably a cut-and-paste error) in a Xen hypercall * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: x86/xen: Fix cleanup logic in emulation of Xen schedop poll hypercalls
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kvm/xen.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/xen.c b/arch/x86/kvm/xen.c
index 5fa2cca43653..d6b2a665b499 100644
--- a/arch/x86/kvm/xen.c
+++ b/arch/x86/kvm/xen.c
@@ -1526,7 +1526,7 @@ static bool kvm_xen_schedop_poll(struct kvm_vcpu *vcpu, bool longmode,
if (kvm_read_guest_virt(vcpu, (gva_t)sched_poll.ports, ports,
sched_poll.nr_ports * sizeof(*ports), &e)) {
*r = -EFAULT;
- return true;
+ goto out;
}
for (i = 0; i < sched_poll.nr_ports; i++) {