Commit 2b097e9b authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-arm-for-4.5-rc7' of... 

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
parents 70e4da7a 4cad67fc

arch/arm/kvm/guest.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

arch/arm64/kvm/guest.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}



/**