Commit 152b2839 authored Aug 06, 2015 by Nicholas Krause Committed by Christian Borntraeger Aug 07, 2015

KVM: s390: Fix assumption that kvm_set_irq_routing is always run successfully



This fixes the assumption that kvm_set_irq_routing is always run
successfully by instead making it equal to the variable r which
we use for returning in the function kvm_arch_vm_ioctl instead
of making r equal to zero when calling this particular function
and incorrectly making the caller of kvm_arch_vm_ioctl think
the function has run successfully.

Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
Message-Id: <1438880754-27149-1-git-send-email-xerofoify@gmail.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>

parent fdf03650

arch/s390/kvm/kvm-s390.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -962,8 +962,7 @@ long kvm_arch_vm_ioctl(struct file *filp,
		if (kvm->arch.use_irqchip) {
		/* Set up dummy routing. */
		memset(&routing, 0, sizeof(routing));
		kvm_set_irq_routing(kvm, &routing, 0, 0);
		r = 0;
		r = kvm_set_irq_routing(kvm, &routing, 0, 0);
		}
		break;
		}

Admin message