lkml.org 
[lkml]   [2016]   [Feb]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRE: [patch] rapidio: mport_cdev: fix some error codes
Date
Thank you.

Acked


> -----Original Message-----
> From: Dan Carpenter [mailto:dan.carpenter@oracle.com]
> Sent: Friday, February 12, 2016 1:37 AM
> To: Matt Porter; Bounine, Alexandre
> Cc: Andrew Morton; linux-kernel@vger.kernel.org; kernel-
> janitors@vger.kernel.org
> Subject: [patch] rapidio: mport_cdev: fix some error codes
>
> copy_to_user() returns the number of bytes not copied but we want to
> return an error code.
>
> Fixes: a45bfc36bf0d ('rapidio: add mport char device driver')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/rapidio/devices/rio_mport_cdev.c
> b/drivers/rapidio/devices/rio_mport_cdev.c
> index 6d56725..a3369d1 100644
> --- a/drivers/rapidio/devices/rio_mport_cdev.c
> +++ b/drivers/rapidio/devices/rio_mport_cdev.c
> @@ -2140,9 +2140,10 @@ static long mport_cdev_ioctl(struct file *filp,
> return maint_port_idx_get(data, (void __user *)arg);
> case RIO_MPORT_GET_PROPERTIES:
> md->properties.hdid = md->mport->host_deviceid;
> - err = copy_to_user((void __user *)arg, &(data->md-
> >properties),
> - sizeof(data->md->properties));
> - break;
> + if (copy_to_user((void __user *)arg, &(data->md-
> >properties),
> + sizeof(data->md->properties)))
> + return -EFAULT;
> + return 0;
> case RIO_ENABLE_DOORBELL_RANGE:
> return rio_mport_add_db_filter(data, (void __user *)arg);
> case RIO_DISABLE_DOORBELL_RANGE:
> @@ -2155,8 +2156,10 @@ static long mport_cdev_ioctl(struct file *filp,
> data->event_mask = arg;
> return 0;
> case RIO_GET_EVENT_MASK:
> - return copy_to_user((void __user *)arg, &data->event_mask,
> - sizeof(data->event_mask));
> + if (copy_to_user((void __user *)arg, &data->event_mask,
> + sizeof(data->event_mask)))
> + return -EFAULT;
> + return 0;
> case RIO_MAP_OUTBOUND:
> return rio_mport_obw_map(filp, (void __user *)arg);
> case RIO_MAP_INBOUND:

\
 
 \ /
  Last update: 2016-02-12 14:01    [W:0.072 / U:0.176 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site