Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cad67fc authored Feb 28, 2016 by Michael S. Tsirkin Committed by Marc Zyngier Feb 29, 2016

arm/arm64: KVM: Fix ioctl error handling



Calling return copy_to_user(...) in an ioctl will not
do the right thing if there's a pagefault:
copy_to_user returns the number of bytes not copied
in this case.

Fix up kvm to do
	return copy_to_user(...)) ?  -EFAULT : 0;

everywhere.

Cc: stable@vger.kernel.org
Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>

parent fd451b90

arch/arm/kvm/guest.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -161,7 +161,7 @@ static int get_timer_reg(struct kvm_vcpu vcpu, const struct kvm_one_reg reg)
		u64 val;

		val = kvm_arm_timer_get_reg(vcpu, reg->id);
		return copy_to_user(uaddr, &val, KVM_REG_SIZE(reg->id));
		return copy_to_user(uaddr, &val, KVM_REG_SIZE(reg->id)) ? -EFAULT : 0;
		}

		static unsigned long num_core_regs(void)

arch/arm64/kvm/guest.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -194,7 +194,7 @@ static int get_timer_reg(struct kvm_vcpu vcpu, const struct kvm_one_reg reg)
		u64 val;

		val = kvm_arm_timer_get_reg(vcpu, reg->id);
		return copy_to_user(uaddr, &val, KVM_REG_SIZE(reg->id));
		return copy_to_user(uaddr, &val, KVM_REG_SIZE(reg->id)) ? -EFAULT : 0;
		}

		/**