usb: get rid of pointless access_ok() calls
in all affected cases addresses are passed only to copy_from()_user or copy_to_user(). Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Родитель
e6c0433e27
Коммит
fe6bb59f4d
|
@ -598,8 +598,6 @@ static ssize_t usb_device_read(struct file *file, char __user *buf,
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
if (nbytes <= 0)
|
if (nbytes <= 0)
|
||||||
return 0;
|
return 0;
|
||||||
if (!access_ok(buf, nbytes))
|
|
||||||
return -EFAULT;
|
|
||||||
|
|
||||||
mutex_lock(&usb_bus_idr_lock);
|
mutex_lock(&usb_bus_idr_lock);
|
||||||
/* print devices for all busses */
|
/* print devices for all busses */
|
||||||
|
|
|
@ -1127,11 +1127,6 @@ static int proc_control(struct usb_dev_state *ps, void __user *arg)
|
||||||
ctrl.bRequestType, ctrl.bRequest, ctrl.wValue,
|
ctrl.bRequestType, ctrl.bRequest, ctrl.wValue,
|
||||||
ctrl.wIndex, ctrl.wLength);
|
ctrl.wIndex, ctrl.wLength);
|
||||||
if (ctrl.bRequestType & 0x80) {
|
if (ctrl.bRequestType & 0x80) {
|
||||||
if (ctrl.wLength && !access_ok(ctrl.data,
|
|
||||||
ctrl.wLength)) {
|
|
||||||
ret = -EINVAL;
|
|
||||||
goto done;
|
|
||||||
}
|
|
||||||
pipe = usb_rcvctrlpipe(dev, 0);
|
pipe = usb_rcvctrlpipe(dev, 0);
|
||||||
snoop_urb(dev, NULL, pipe, ctrl.wLength, tmo, SUBMIT, NULL, 0);
|
snoop_urb(dev, NULL, pipe, ctrl.wLength, tmo, SUBMIT, NULL, 0);
|
||||||
|
|
||||||
|
@ -1216,10 +1211,6 @@ static int proc_bulk(struct usb_dev_state *ps, void __user *arg)
|
||||||
}
|
}
|
||||||
tmo = bulk.timeout;
|
tmo = bulk.timeout;
|
||||||
if (bulk.ep & 0x80) {
|
if (bulk.ep & 0x80) {
|
||||||
if (len1 && !access_ok(bulk.data, len1)) {
|
|
||||||
ret = -EINVAL;
|
|
||||||
goto done;
|
|
||||||
}
|
|
||||||
snoop_urb(dev, NULL, pipe, len1, tmo, SUBMIT, NULL, 0);
|
snoop_urb(dev, NULL, pipe, len1, tmo, SUBMIT, NULL, 0);
|
||||||
|
|
||||||
usb_unlock_device(dev);
|
usb_unlock_device(dev);
|
||||||
|
|
|
@ -252,9 +252,6 @@ static ssize_t f_hidg_read(struct file *file, char __user *buffer,
|
||||||
if (!count)
|
if (!count)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (!access_ok(buffer, count))
|
|
||||||
return -EFAULT;
|
|
||||||
|
|
||||||
spin_lock_irqsave(&hidg->read_spinlock, flags);
|
spin_lock_irqsave(&hidg->read_spinlock, flags);
|
||||||
|
|
||||||
#define READ_COND (!list_empty(&hidg->completed_out_req))
|
#define READ_COND (!list_empty(&hidg->completed_out_req))
|
||||||
|
@ -339,9 +336,6 @@ static ssize_t f_hidg_write(struct file *file, const char __user *buffer,
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
ssize_t status = -ENOMEM;
|
ssize_t status = -ENOMEM;
|
||||||
|
|
||||||
if (!access_ok(buffer, count))
|
|
||||||
return -EFAULT;
|
|
||||||
|
|
||||||
spin_lock_irqsave(&hidg->write_spinlock, flags);
|
spin_lock_irqsave(&hidg->write_spinlock, flags);
|
||||||
|
|
||||||
#define WRITE_COND (!hidg->write_pending)
|
#define WRITE_COND (!hidg->write_pending)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче