summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-03-03 22:54:56 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2016-03-03 22:54:56 +0300
commitc2687cf9502a4b69abc0f3a7b1618ffef47a40db (patch)
tree2af1ab08b71c349fe27225fa059cebfac38553ab /arch/arm
parent4237b2e6c6ca77b72f0b45ffad29e284e776ede3 (diff)
parent2680d6da455b636dd006636780c0f235c6561d70 (diff)
downloadlinux-c2687cf9502a4b69abc0f3a7b1618ffef47a40db.tar.xz
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM fixes from Paolo Bonzini: - ARM/MIPS: Fixes for ioctls when copy_from_user returns nonzero - x86: Small fix for Skylake TSC scaling - x86: Improved fix for last week's missed hardware breakpoint bug * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: kvm: x86: Update tsc multiplier on change. mips/kvm: fix ioctl error handling arm/arm64: KVM: Fix ioctl error handling KVM: x86: fix root cause for missed hardware breakpoints
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/kvm/guest.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kvm/guest.c b/arch/arm/kvm/guest.c
index 5fa69d7bae58..99361f11354a 100644
--- a/arch/arm/kvm/guest.c
+++ b/arch/arm/kvm/guest.c
@@ -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)