Commit fe6bb59f authored by Al Viro's avatar Al Viro
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent e6c0433e

drivers/usb/core/devices.c

+0 −2
Original line number Diff line number Diff line
@@ -598,8 +598,6 @@ static ssize_t usb_device_read(struct file *file, char __user *buf, 
		return -EINVAL;

	if (nbytes <= 0)

		return 0;

	if (!access_ok(buf, nbytes))

		return -EFAULT;



	mutex_lock(&usb_bus_idr_lock);

	/* print devices for all busses */

drivers/usb/core/devio.c

+0 −9
Original line number Diff line number Diff line
@@ -1127,11 +1127,6 @@ static int proc_control(struct usb_dev_state *ps, void __user *arg) 
		ctrl.bRequestType, ctrl.bRequest, ctrl.wValue,

		ctrl.wIndex, ctrl.wLength);

	if (ctrl.bRequestType & 0x80) {

		if (ctrl.wLength && !access_ok(ctrl.data,

					       ctrl.wLength)) {

			ret = -EINVAL;

			goto done;

		}

		pipe = usb_rcvctrlpipe(dev, 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;

	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);



		usb_unlock_device(dev);

drivers/usb/gadget/function/f_hid.c

+0 −6
Original line number Diff line number Diff line
@@ -252,9 +252,6 @@ static ssize_t f_hidg_read(struct file *file, char __user *buffer, 
	if (!count)

		return 0;



	if (!access_ok(buffer, count))

		return -EFAULT;



	spin_lock_irqsave(&hidg->read_spinlock, flags);



#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;

	ssize_t status = -ENOMEM;



	if (!access_ok(buffer, count))

		return -EFAULT;



	spin_lock_irqsave(&hidg->write_spinlock, flags);



#define WRITE_COND (!hidg->write_pending)

CRA Git | Maintained and supported by SUSTech CRA and CCSE