leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: raw-gadget: Fix copy_to/from_user() checks

Browse Source 
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: f2c2e71764 ("usb: gadget: add raw-gadget interface")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Andrey Konovalov <andreyknvl@google.com>
Tested-by: Andrey Konovalov <andreyknvl@google.com>
Link: https://lore.kernel.org/r/20200406145119.GG68494@mwanda
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dan Carpenter 2020-04-06 17:51:19 +03:00 committed by Greg Kroah-Hartman
parent 97341ef707
commit 068fbff4f8
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/usb/gadget/legacy/raw_gadget.c
View File

@ -392,9 +392,8 @@ static int raw_ioctl_init(struct raw_dev *dev, unsigned long value)
char *udc_device_name; char *udc_device_name;
unsigned long flags; unsigned long flags;
ret = copy_from_user(&arg, (void __user *)value, sizeof(arg)); if (copy_from_user(&arg, (void __user *)value, sizeof(arg)))
if (ret) return -EFAULT;
return ret;
switch (arg.speed) { switch (arg.speed) {
case USB_SPEED_UNKNOWN: case USB_SPEED_UNKNOWN:
@ -501,15 +500,13 @@ out_unlock:
static int raw_ioctl_event_fetch(struct raw_dev *dev, unsigned long value) static int raw_ioctl_event_fetch(struct raw_dev *dev, unsigned long value)
{ {
int ret = 0;
struct usb_raw_event arg; struct usb_raw_event arg;
unsigned long flags; unsigned long flags;
struct usb_raw_event *event; struct usb_raw_event *event;
uint32_t length; uint32_t length;
ret = copy_from_user(&arg, (void __user *)value, sizeof(arg)); if (copy_from_user(&arg, (void __user *)value, sizeof(arg)))
if (ret) return -EFAULT;
return ret;
spin_lock_irqsave(&dev->lock, flags); spin_lock_irqsave(&dev->lock, flags);
if (dev->state != STATE_DEV_RUNNING) { if (dev->state != STATE_DEV_RUNNING) {
@ -530,20 +527,19 @@ static int raw_ioctl_event_fetch(struct raw_dev *dev, unsigned long value)
return -EINTR; return -EINTR;
} }
length = min(arg.length, event->length); length = min(arg.length, event->length);
ret = copy_to_user((void __user *)value, event, if (copy_to_user((void __user *)value, event, sizeof(*event) + length))
sizeof(*event) + length); return -EFAULT;
return ret;
return 0;
} }
static void *raw_alloc_io_data(struct usb_raw_ep_io *io, void __user *ptr, static void *raw_alloc_io_data(struct usb_raw_ep_io *io, void __user *ptr,
bool get_from_user) bool get_from_user)
{ {
int ret;
void *data; void *data;
ret = copy_from_user(io, ptr, sizeof(*io)); if (copy_from_user(io, ptr, sizeof(*io)))
if (ret) return ERR_PTR(-EFAULT);
return ERR_PTR(ret);
if (io->ep >= USB_RAW_MAX_ENDPOINTS) if (io->ep >= USB_RAW_MAX_ENDPOINTS)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
if (!usb_raw_io_flags_valid(io->flags)) 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)
if (IS_ERR(data)) if (IS_ERR(data))
return PTR_ERR(data); return PTR_ERR(data);
ret = raw_process_ep0_io(dev, &io, data, false); ret = raw_process_ep0_io(dev, &io, data, false);
if (ret < 0) { if (ret)
kfree(data); goto free;
return ret;
}
length = min(io.length, (unsigned int)ret); length = min(io.length, (unsigned int)ret);
ret = copy_to_user((void __user *)(value + sizeof(io)), data, length); if (copy_to_user((void __user *)(value + sizeof(io)), data, length))
ret = -EFAULT;
free:
kfree(data); kfree(data);
return ret; return ret;
} }
@ -952,12 +949,13 @@ static int raw_ioctl_ep_read(struct raw_dev *dev, unsigned long value)
if (IS_ERR(data)) if (IS_ERR(data))
return PTR_ERR(data); return PTR_ERR(data);
ret = raw_process_ep_io(dev, &io, data, false); ret = raw_process_ep_io(dev, &io, data, false);
if (ret < 0) { if (ret)
kfree(data); goto free;
return ret;
}
length = min(io.length, (unsigned int)ret); length = min(io.length, (unsigned int)ret);
ret = copy_to_user((void __user *)(value + sizeof(io)), data, length); if (copy_to_user((void __user *)(value + sizeof(io)), data, length))
ret = -EFAULT;
free:
kfree(data); kfree(data);
return ret; return ret;
} }