diff options
author | Michael S. Tsirkin <mst@redhat.com> | 2016-02-28 10:35:59 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2016-02-29 09:52:20 -0500 |
commit | 887349f69f37e71e2a8bfbd743831625a0b2ff51 (patch) | |
tree | ac0d63782c01d60270a07279514394759062640e | |
parent | 56fa81fc9a5445938f3aa2e63d15ab63dc938ad6 (diff) |
MIPS: kvm: Fix ioctl error handling.
Calling return copy_to_user(...) or return copy_from_user in an ioctl
will not do the right thing if there's a pagefault:
copy_to_user/copy_from_user return the number of bytes not copied in
this case.
Fix up kvm on mips to do
return copy_to_user(...)) ? -EFAULT : 0;
and
return copy_from_user(...)) ? -EFAULT : 0;
everywhere.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: linux-kernel@vger.kernel.org
Cc: linux-mips@linux-mips.org
Cc: stable@vger.kernel.org
Cc: kvm@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/12709/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/kvm/mips.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c index 8bc3977576e6..3110447ab1e9 100644 --- a/arch/mips/kvm/mips.c +++ b/arch/mips/kvm/mips.c | |||
@@ -702,7 +702,7 @@ static int kvm_mips_get_reg(struct kvm_vcpu *vcpu, | |||
702 | } else if ((reg->id & KVM_REG_SIZE_MASK) == KVM_REG_SIZE_U128) { | 702 | } else if ((reg->id & KVM_REG_SIZE_MASK) == KVM_REG_SIZE_U128) { |
703 | void __user *uaddr = (void __user *)(long)reg->addr; | 703 | void __user *uaddr = (void __user *)(long)reg->addr; |
704 | 704 | ||
705 | return copy_to_user(uaddr, vs, 16); | 705 | return copy_to_user(uaddr, vs, 16) ? -EFAULT : 0; |
706 | } else { | 706 | } else { |
707 | return -EINVAL; | 707 | return -EINVAL; |
708 | } | 708 | } |
@@ -732,7 +732,7 @@ static int kvm_mips_set_reg(struct kvm_vcpu *vcpu, | |||
732 | } else if ((reg->id & KVM_REG_SIZE_MASK) == KVM_REG_SIZE_U128) { | 732 | } else if ((reg->id & KVM_REG_SIZE_MASK) == KVM_REG_SIZE_U128) { |
733 | void __user *uaddr = (void __user *)(long)reg->addr; | 733 | void __user *uaddr = (void __user *)(long)reg->addr; |
734 | 734 | ||
735 | return copy_from_user(vs, uaddr, 16); | 735 | return copy_from_user(vs, uaddr, 16) ? -EFAULT : 0; |
736 | } else { | 736 | } else { |
737 | return -EINVAL; | 737 | return -EINVAL; |
738 | } | 738 | } |