Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1345324 > unrolled thread

[PATCH for-4,5] mips/kvm: fix ioctl error handling

Back to article view | Back to linux.kernel

Contents

  [PATCH for-4,5] mips/kvm: fix ioctl error handling "Michael S. Tsirkin" <mst@redhat.com> - 2016-02-28 16:40 +0100
    Re: [PATCH for-4,5] mips/kvm: fix ioctl error handling Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2016-02-28 18:40 +0100
    Re: [PATCH for-4,5] mips/kvm: fix ioctl error handling Paolo Bonzini <pbonzini@redhat.com> - 2016-03-02 10:40 +0100

#1345324 — [PATCH for-4,5] 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.

Cc: stable@vger.kernel.org
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---

Untested.

 arch/mips/kvm/mips.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
index 8bc3977..3110447 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,
 	} else if ((reg->id & KVM_REG_SIZE_MASK) == KVM_REG_SIZE_U128) {
 		void __user *uaddr = (void __user *)(long)reg->addr;
 
-		return copy_to_user(uaddr, vs, 16);
+		return copy_to_user(uaddr, vs, 16) ? -EFAULT : 0;
 	} else {
 		return -EINVAL;
 	}
@@ -732,7 +732,7 @@ static int kvm_mips_set_reg(struct kvm_vcpu *vcpu,
 	} else if ((reg->id & KVM_REG_SIZE_MASK) == KVM_REG_SIZE_U128) {
 		void __user *uaddr = (void __user *)(long)reg->addr;
 
-		return copy_from_user(vs, uaddr, 16);
+		return copy_from_user(vs, uaddr, 16) ? -EFAULT : 0;
 	} else {
 		return -EINVAL;
 	}
-- 
MST

[toc] | [next] | [standalone]

#1345363

Hello.

On 02/28/2016 06:35 PM, Michael S. Tsirkin wrote:

> Calling return copy_to_user(...) or return copy_from_user in an ioctl

    Calling return? Perhaps "returning the result of"?

> 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.
>
> Cc: stable@vger.kernel.org
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
[...]

MBR, Sergei

[toc] | [prev] | [next] | [standalone]

#1347890

On 28/02/2016 16:35, Michael S. Tsirkin wrote:
> 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.
> 
> Cc: stable@vger.kernel.org
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> 
> Untested.
> 
>  arch/mips/kvm/mips.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
> index 8bc3977..3110447 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,
>  	} else if ((reg->id & KVM_REG_SIZE_MASK) == KVM_REG_SIZE_U128) {
>  		void __user *uaddr = (void __user *)(long)reg->addr;
>  
> -		return copy_to_user(uaddr, vs, 16);
> +		return copy_to_user(uaddr, vs, 16) ? -EFAULT : 0;
>  	} else {
>  		return -EINVAL;
>  	}
> @@ -732,7 +732,7 @@ static int kvm_mips_set_reg(struct kvm_vcpu *vcpu,
>  	} else if ((reg->id & KVM_REG_SIZE_MASK) == KVM_REG_SIZE_U128) {
>  		void __user *uaddr = (void __user *)(long)reg->addr;
>  
> -		return copy_from_user(vs, uaddr, 16);
> +		return copy_from_user(vs, uaddr, 16) ? -EFAULT : 0;
>  	} else {
>  		return -EINVAL;
>  	}
> 

Applied with the commit message tweak suggested by Sergei.

Paolo

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web