Commit 2a9d0083 authored by Oliver Neukum's avatar Oliver Neukum Committed by Greg Kroah-Hartman

USB: BKL removal from ioctl path of usbfs

Total removal from the ioctl code path except for the outcall
to external modules. Locking is ensured by the normal locks
of usbfs.
Signed-off-by: default avatarOliver Neukum <oliver@neukum.org>
Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 9fd5c675
...@@ -1636,7 +1636,10 @@ static int proc_ioctl(struct dev_state *ps, struct usbdevfs_ioctl *ctl) ...@@ -1636,7 +1636,10 @@ static int proc_ioctl(struct dev_state *ps, struct usbdevfs_ioctl *ctl)
if (driver == NULL || driver->ioctl == NULL) { if (driver == NULL || driver->ioctl == NULL) {
retval = -ENOTTY; retval = -ENOTTY;
} else { } else {
/* keep API that guarantees BKL */
lock_kernel();
retval = driver->ioctl(intf, ctl->ioctl_code, buf); retval = driver->ioctl(intf, ctl->ioctl_code, buf);
unlock_kernel();
if (retval == -ENOIOCTLCMD) if (retval == -ENOIOCTLCMD)
retval = -ENOTTY; retval = -ENOTTY;
} }
...@@ -1720,11 +1723,9 @@ static long usbdev_do_ioctl(struct file *file, unsigned int cmd, ...@@ -1720,11 +1723,9 @@ static long usbdev_do_ioctl(struct file *file, unsigned int cmd,
if (!(file->f_mode & FMODE_WRITE)) if (!(file->f_mode & FMODE_WRITE))
return -EPERM; return -EPERM;
lock_kernel();
usb_lock_device(dev); usb_lock_device(dev);
if (!connected(ps)) { if (!connected(ps)) {
usb_unlock_device(dev); usb_unlock_device(dev);
unlock_kernel();
return -ENODEV; return -ENODEV;
} }
...@@ -1783,12 +1784,10 @@ static long usbdev_do_ioctl(struct file *file, unsigned int cmd, ...@@ -1783,12 +1784,10 @@ static long usbdev_do_ioctl(struct file *file, unsigned int cmd,
break; break;
case USBDEVFS_SUBMITURB: case USBDEVFS_SUBMITURB:
unlock_kernel();
snoop(&dev->dev, "%s: SUBMITURB\n", __func__); snoop(&dev->dev, "%s: SUBMITURB\n", __func__);
ret = proc_submiturb(ps, p); ret = proc_submiturb(ps, p);
if (ret >= 0) if (ret >= 0)
inode->i_mtime = CURRENT_TIME; inode->i_mtime = CURRENT_TIME;
lock_kernel();
break; break;
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
...@@ -1840,17 +1839,13 @@ static long usbdev_do_ioctl(struct file *file, unsigned int cmd, ...@@ -1840,17 +1839,13 @@ static long usbdev_do_ioctl(struct file *file, unsigned int cmd,
break; break;
case USBDEVFS_REAPURB: case USBDEVFS_REAPURB:
unlock_kernel();
snoop(&dev->dev, "%s: REAPURB\n", __func__); snoop(&dev->dev, "%s: REAPURB\n", __func__);
ret = proc_reapurb(ps, p); ret = proc_reapurb(ps, p);
lock_kernel();
break; break;
case USBDEVFS_REAPURBNDELAY: case USBDEVFS_REAPURBNDELAY:
unlock_kernel();
snoop(&dev->dev, "%s: REAPURBNDELAY\n", __func__); snoop(&dev->dev, "%s: REAPURBNDELAY\n", __func__);
ret = proc_reapurbnonblock(ps, p); ret = proc_reapurbnonblock(ps, p);
lock_kernel();
break; break;
case USBDEVFS_DISCSIGNAL: case USBDEVFS_DISCSIGNAL:
...@@ -1884,7 +1879,6 @@ static long usbdev_do_ioctl(struct file *file, unsigned int cmd, ...@@ -1884,7 +1879,6 @@ static long usbdev_do_ioctl(struct file *file, unsigned int cmd,
break; break;
} }
usb_unlock_device(dev); usb_unlock_device(dev);
unlock_kernel();
if (ret >= 0) if (ret >= 0)
inode->i_atime = CURRENT_TIME; inode->i_atime = CURRENT_TIME;
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment