Commit ff1f3cb4 authored Dec 09, 2013 by Dominik Dingel Committed by Cornelia Huck Dec 11, 2013

KVM: s390: ioeventfd: ignore leftmost bits



The diagnose 500 subcode 3 contains the 32 bit subchannel id in bits 32-63
(counting from the left). As for other I/O instructions, bits 0-31 should be
ignored and thus not be passed to kvm_io_bus_write_cookie().

This fixes a bug where the guest passed non-zero bits 0-31 which the
host tried to interpret, leading to ioeventfd notification failures.

Cc: stable@vger.kernel.org
Signed-off-by: Dominik Dingel <dingel@linux.vnet.ibm.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>

parent 58bc33b2

arch/s390/kvm/diag.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -121,7 +121,7 @@ static int __diag_virtio_hypercall(struct kvm_vcpu *vcpu)
		* - gpr 4 contains the index on the bus (optionally)
		*/
		ret = kvm_io_bus_write_cookie(vcpu->kvm, KVM_VIRTIO_CCW_NOTIFY_BUS,
		vcpu->run->s.regs.gprs[2],
		vcpu->run->s.regs.gprs[2] & 0xffffffff,
		8, &vcpu->run->s.regs.gprs[3],
		vcpu->run->s.regs.gprs[4]);