Merge tag 'kvm-arm-for-4.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master

bonzini · bonzini · commit 2b097e9bc374 · 2016-03-02T10:31:30.000+01:00
KVM/ARM fixes for 4.5-rc7

- Fix ioctl error handling on the timer path
diff --git 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
@@ -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;
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ static int get_timer_reg(struct kvm_vcpu vcpu, const struct kvm_one_reg reg)`
`161`	`161`	`u64 val;`
`162`	`162`
`163`	`163`	`val = kvm_arm_timer_get_reg(vcpu, reg->id);`
`164`		`- return copy_to_user(uaddr, &val, KVM_REG_SIZE(reg->id));`
	`164`	`+ return copy_to_user(uaddr, &val, KVM_REG_SIZE(reg->id)) ? -EFAULT : 0;`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`static unsigned long num_core_regs(void)`
Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ static int get_timer_reg(struct kvm_vcpu vcpu, const struct kvm_one_reg reg)`
`194`	`194`	`u64 val;`
`195`	`195`
`196`	`196`	`val = kvm_arm_timer_get_reg(vcpu, reg->id);`
`197`		`- return copy_to_user(uaddr, &val, KVM_REG_SIZE(reg->id));`
	`197`	`+ return copy_to_user(uaddr, &val, KVM_REG_SIZE(reg->id)) ? -EFAULT : 0;`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`/**`