Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

torvalds · torvalds · commit f9af7b5d9349 · 2025-07-23T15:04:27.000-07:00
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
diff --git 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++) {

Original file line number	Diff line number	Diff line change
`@@ -1526,7 +1526,7 @@ static bool kvm_xen_schedop_poll(struct kvm_vcpu *vcpu, bool longmode,`
`1526`	`1526`	`if (kvm_read_guest_virt(vcpu, (gva_t)sched_poll.ports, ports,`
`1527`	`1527`	`sched_poll.nr_ports * sizeof(*ports), &e)) {`
`1528`	`1528`	`*r = -EFAULT;`
`1529`		`- return true;`
	`1529`	`+ goto out;`
`1530`	`1530`	`}`
`1531`	`1531`
`1532`	`1532`	`for (i = 0; i < sched_poll.nr_ports; i++) {`