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

Commit bd218bce authored by Will Deacon's avatar Will Deacon Committed by Christoffer Dall
Browse files

KVM: ARM/arm64: return -EFAULT if copy_from_user fails in set_timer_reg 



We currently return the number of bytes not copied if set_timer_reg
fails, which is almost certainly not what userspace would like.

This patch returns -EFAULT instead.

Cc: Christoffer Dall <christoffer.dall@linaro.org>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent 18d45766

arch/arm/kvm/guest.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -163,7 +163,7 @@ static int set_timer_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) 




	ret = copy_from_user(&val, uaddr, KVM_REG_SIZE(reg->id));

	ret = copy_from_user(&val, uaddr, KVM_REG_SIZE(reg->id));

	if (ret != 0)

	if (ret != 0)

		return ret;

		return -EFAULT;





	return kvm_arm_timer_set_reg(vcpu, reg->id, val);

	return kvm_arm_timer_set_reg(vcpu, reg->id, val);

}

}

arch/arm64/kvm/guest.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -174,7 +174,7 @@ static int set_timer_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) 




	ret = copy_from_user(&val, uaddr, KVM_REG_SIZE(reg->id));

	ret = copy_from_user(&val, uaddr, KVM_REG_SIZE(reg->id));

	if (ret != 0)

	if (ret != 0)

		return ret;

		return -EFAULT;





	return kvm_arm_timer_set_reg(vcpu, reg->id, val);

	return kvm_arm_timer_set_reg(vcpu, reg->id, val);

}

}