Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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
Paolo Bonzini 9 years ago
parent
70e4da7a8f 4cad67fca3
commit
2b097e9bc3
2 changed files with 2 additions and 2 deletions
Split View Show Diff Stats
  1. 1 1
      arch/arm/kvm/guest.c
  2. 1 1
      arch/arm64/kvm/guest.c

+ 1 - 1
arch/arm/kvm/guest.c
View File 

@@ -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)

+ 1 - 1
arch/arm64/kvm/guest.c
View File 

@@ -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;
 
 }
 
 
 /**