Message ID | E41B4CD8-5314-4535-A664-D3962703F6C4@suse.de |
---|---|
State | New, archived |
Headers | show |
On Mon, Apr 16, 2012 at 06:54:50PM +0200, Alexander Graf wrote: > > Yeah :(. I already have this patch in my tree to fix that: ... > case KVM_REG_PPC_HIOR: > - r = put_user(to_book3s(vcpu)->hior, > - (u64 __user *)(long)reg->addr); > + r = copy_to_user((u64 __user *)(long)reg->addr, > + &to_book3s(vcpu)->hior, sizeof(u64)); I folded this in with your other patch that touches these lines and sent it to Avi, and it is in Linus' tree as b8e6f8ae51. Paul. -- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c index 1717ac8..e2be5ad 100644 --- a/arch/powerpc/kvm/book3s_pr.c +++ b/arch/powerpc/kvm/book3s_pr.c @@ -881,8 +881,8 @@ int kvm_vcpu_ioctl_get_one_reg(struct kvm_vcpu *vcpu, struct kvm_one_reg *reg) switch (reg->id) { case KVM_REG_PPC_HIOR: - r = put_user(to_book3s(vcpu)->hior, - (u64 __user *)(long)reg->addr); + r = copy_to_user((u64 __user *)(long)reg->addr, + &to_book3s(vcpu)->hior, sizeof(u64)); break; default: break; @@ -897,8 +897,8 @@ int kvm_vcpu_ioctl_set_one_reg(struct kvm_vcpu *vcpu, struct kvm_one_reg *reg) switch (reg->id) { case KVM_REG_PPC_HIOR: - r = get_user(to_book3s(vcpu)->hior, - (u64 __user *)(long)reg->addr); + r = copy_from_user(&to_book3s(vcpu)->hior, + (u64 __user *)(long)reg->addr, sizeof(u64)); if (!r) to_book3s(vcpu)->hior_explicit = true; break;--