diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2016-03-02 10:31:30 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-03-02 10:31:30 +0100 |
| commit | 2b097e9bc3742d4ffc63fe64b8fd44242d662392 (patch) | |
| tree | 1b11bd0b64a29877144da90e218bcc24f976551f | |
| parent | 70e4da7a8ff62f2775337b705f45c804bb450454 (diff) | |
| parent | 4cad67fca3fc952d6f2ed9e799621f07666a560f (diff) | |
| download | linux-2b097e9bc3742d4ffc63fe64b8fd44242d662392.tar.gz linux-2b097e9bc3742d4ffc63fe64b8fd44242d662392.tar.bz2 linux-2b097e9bc3742d4ffc63fe64b8fd44242d662392.zip | |
Merge tag 'kvm-arm-for-4.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master
KVM/ARM fixes for 4.5-rc7
- Fix ioctl error handling on the timer path
| -rw-r--r-- | arch/arm/kvm/guest.c | 2 | ||||
| -rw-r--r-- | arch/arm64/kvm/guest.c | 2 |
2 files changed, 2 insertions, 2 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) diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c index fcb778899a38..9e54ad7c240a 100644 --- a/arch/arm64/kvm/guest.c +++ b/arch/arm64/kvm/guest.c @@ -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; } /** |