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

Groups > linux.kernel > #1347890

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

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[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

csiph-web