Skip to content

Commit 068fbff

Browse files
Dan Carpentergregkh
authored andcommitted
usb: raw-gadget: Fix copy_to/from_user() checks
The copy_to/from_user() functions return the number of bytes remaining but we want to return negative error codes. I changed a couple checks in raw_ioctl_ep_read() and raw_ioctl_ep0_read() to show that we still we returning zero on error. Fixes: f2c2e71 ("usb: gadget: add raw-gadget interface") Signed-off-by: Dan Carpenter <[email protected]> Reviewed-by: Andrey Konovalov <[email protected]> Tested-by: Andrey Konovalov <[email protected]> Link: https://lore.kernel.org/r/20200406145119.GG68494@mwanda Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 97341ef commit 068fbff

File tree

1 file changed

+22
-24
lines changed

1 file changed

+22
-24
lines changed

drivers/usb/gadget/legacy/raw_gadget.c

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -392,9 +392,8 @@ static int raw_ioctl_init(struct raw_dev *dev, unsigned long value)
392392
char *udc_device_name;
393393
unsigned long flags;
394394

395-
ret = copy_from_user(&arg, (void __user *)value, sizeof(arg));
396-
if (ret)
397-
return ret;
395+
if (copy_from_user(&arg, (void __user *)value, sizeof(arg)))
396+
return -EFAULT;
398397

399398
switch (arg.speed) {
400399
case USB_SPEED_UNKNOWN:
@@ -501,15 +500,13 @@ static int raw_ioctl_run(struct raw_dev *dev, unsigned long value)
501500

502501
static int raw_ioctl_event_fetch(struct raw_dev *dev, unsigned long value)
503502
{
504-
int ret = 0;
505503
struct usb_raw_event arg;
506504
unsigned long flags;
507505
struct usb_raw_event *event;
508506
uint32_t length;
509507

510-
ret = copy_from_user(&arg, (void __user *)value, sizeof(arg));
511-
if (ret)
512-
return ret;
508+
if (copy_from_user(&arg, (void __user *)value, sizeof(arg)))
509+
return -EFAULT;
513510

514511
spin_lock_irqsave(&dev->lock, flags);
515512
if (dev->state != STATE_DEV_RUNNING) {
@@ -530,20 +527,19 @@ static int raw_ioctl_event_fetch(struct raw_dev *dev, unsigned long value)
530527
return -EINTR;
531528
}
532529
length = min(arg.length, event->length);
533-
ret = copy_to_user((void __user *)value, event,
534-
sizeof(*event) + length);
535-
return ret;
530+
if (copy_to_user((void __user *)value, event, sizeof(*event) + length))
531+
return -EFAULT;
532+
533+
return 0;
536534
}
537535

538536
static void *raw_alloc_io_data(struct usb_raw_ep_io *io, void __user *ptr,
539537
bool get_from_user)
540538
{
541-
int ret;
542539
void *data;
543540

544-
ret = copy_from_user(io, ptr, sizeof(*io));
545-
if (ret)
546-
return ERR_PTR(ret);
541+
if (copy_from_user(io, ptr, sizeof(*io)))
542+
return ERR_PTR(-EFAULT);
547543
if (io->ep >= USB_RAW_MAX_ENDPOINTS)
548544
return ERR_PTR(-EINVAL);
549545
if (!usb_raw_io_flags_valid(io->flags))
@@ -658,12 +654,13 @@ static int raw_ioctl_ep0_read(struct raw_dev *dev, unsigned long value)
658654
if (IS_ERR(data))
659655
return PTR_ERR(data);
660656
ret = raw_process_ep0_io(dev, &io, data, false);
661-
if (ret < 0) {
662-
kfree(data);
663-
return ret;
664-
}
657+
if (ret)
658+
goto free;
659+
665660
length = min(io.length, (unsigned int)ret);
666-
ret = copy_to_user((void __user *)(value + sizeof(io)), data, length);
661+
if (copy_to_user((void __user *)(value + sizeof(io)), data, length))
662+
ret = -EFAULT;
663+
free:
667664
kfree(data);
668665
return ret;
669666
}
@@ -952,12 +949,13 @@ static int raw_ioctl_ep_read(struct raw_dev *dev, unsigned long value)
952949
if (IS_ERR(data))
953950
return PTR_ERR(data);
954951
ret = raw_process_ep_io(dev, &io, data, false);
955-
if (ret < 0) {
956-
kfree(data);
957-
return ret;
958-
}
952+
if (ret)
953+
goto free;
954+
959955
length = min(io.length, (unsigned int)ret);
960-
ret = copy_to_user((void __user *)(value + sizeof(io)), data, length);
956+
if (copy_to_user((void __user *)(value + sizeof(io)), data, length))
957+
ret = -EFAULT;
958+
free:
961959
kfree(data);
962960
return ret;
963961
}

0 commit comments

Comments
 (0)