Skip to content

Commit

Permalink
rapidio: mport_cdev: fix some error codes
Browse files Browse the repository at this point in the history
copy_to_user() returns the number of bytes not copied but we want to
return an error code.

Fixes: a45bfc3 ('rapidio: add mport char device driver')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Alexandre Bounine <alexandre.bounine@idt.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  • Loading branch information
Dan Carpenter authored and sfrothwell committed Feb 28, 2016
1 parent e3637b5 commit 270b512
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions drivers/rapidio/devices/rio_mport_cdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down

0 comments on commit 270b512

Please sign in to comment.