Skip to content

Commit

Permalink
usb: gadget: functionfs: fix missing access_ok checks
Browse files Browse the repository at this point in the history
use safe copy_*_user instead of unsafe __copy_*_user
functions when accessing userland memory.

Signed-off-by: Daniel Walter <dwalter@sigma-star.at>
Signed-off-by: Felipe Balbi <balbi@ti.com>
  • Loading branch information
Daniel Walter authored and Felipe Balbi committed Nov 18, 2015
1 parent 183e53e commit 7fe9a93
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/usb/gadget/function/f_fs.c
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ static ssize_t __ffs_ep0_read_events(struct ffs_data *ffs, char __user *buf,
spin_unlock_irq(&ffs->ev.waitq.lock);
mutex_unlock(&ffs->mutex);

return unlikely(__copy_to_user(buf, events, size)) ? -EFAULT : size;
return unlikely(copy_to_user(buf, events, size)) ? -EFAULT : size;
}

static ssize_t ffs_ep0_read(struct file *file, char __user *buf,
Expand Down Expand Up @@ -513,7 +513,7 @@ static ssize_t ffs_ep0_read(struct file *file, char __user *buf,

/* unlocks spinlock */
ret = __ffs_ep0_queue_wait(ffs, data, len);
if (likely(ret > 0) && unlikely(__copy_to_user(buf, data, len)))
if (likely(ret > 0) && unlikely(copy_to_user(buf, data, len)))
ret = -EFAULT;
goto done_mutex;

Expand Down Expand Up @@ -3493,7 +3493,7 @@ static char *ffs_prepare_buffer(const char __user *buf, size_t len)
if (unlikely(!data))
return ERR_PTR(-ENOMEM);

if (unlikely(__copy_from_user(data, buf, len))) {
if (unlikely(copy_from_user(data, buf, len))) {
kfree(data);
return ERR_PTR(-EFAULT);
}
Expand Down

0 comments on commit 7fe9a93

Please sign in to comment.