lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

USB-BKL: Convert usb_driver ioctl to unlocked_ioctl

Browse Source 
And audit all the users. None needed the BKL.  That was easy
because there was only very few around.

Tested with allmodconfig build on x86-64

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
From: Andi Kleen <ak@linux.intel.com>
This commit is contained in:
Andi Kleen
2010-06-01 23:04:41 +02:00
committed by Greg Kroah-Hartman
parent 6e12ea4658
commit c532b29a6f
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/usb/core/devio.c
View File

@@ -1668,13 +1668,10 @@ static int proc_ioctl(struct dev_state *ps, struct usbdevfs_ioctl *ctl)
default: default:
if (intf->dev.driver) if (intf->dev.driver)
driver = to_usb_driver(intf->dev.driver); driver = to_usb_driver(intf->dev.driver);
if (driver == NULL || driver->ioctl == NULL) { if (driver == NULL || driver->unlocked_ioctl == NULL) {
retval = -ENOTTY; retval = -ENOTTY;
} else { } else {
/* keep API that guarantees BKL */ retval = driver->unlocked_ioctl(intf, ctl->ioctl_code, buf);
lock_kernel();
retval = driver->ioctl(intf, ctl->ioctl_code, buf);
unlock_kernel();
if (retval == -ENOIOCTLCMD) if (retval == -ENOIOCTLCMD)
retval = -ENOTTY; retval = -ENOTTY;
} }

3
drivers/usb/core/hub.c
View File

@@ -1294,6 +1294,7 @@ descriptor_error:
return -ENODEV; return -ENODEV;
} }
/* No BKL needed */
static int static int
hub_ioctl(struct usb_interface *intf, unsigned int code, void *user_data) hub_ioctl(struct usb_interface *intf, unsigned int code, void *user_data)
{ {
@@ -3465,7 +3466,7 @@ static struct usb_driver hub_driver = {
.reset_resume = hub_reset_resume, .reset_resume = hub_reset_resume,
.pre_reset = hub_pre_reset, .pre_reset = hub_pre_reset,
.post_reset = hub_post_reset, .post_reset = hub_post_reset,
.ioctl = hub_ioctl, .unlocked_ioctl = hub_ioctl,
.id_table = hub_id_table, .id_table = hub_id_table,
.supports_autosuspend = 1, .supports_autosuspend = 1,
}; };

3
drivers/usb/misc/usbtest.c
View File

@@ -1548,6 +1548,7 @@ fail:
* off just killing the userspace task and waiting for it to exit. * off just killing the userspace task and waiting for it to exit.
*/ */
/* No BKL needed */
static int static int
usbtest_ioctl (struct usb_interface *intf, unsigned int code, void *buf) usbtest_ioctl (struct usb_interface *intf, unsigned int code, void *buf)
{ {
@@ -2170,7 +2171,7 @@ static struct usb_driver usbtest_driver = {
.name = "usbtest", .name = "usbtest",
.id_table = id_table, .id_table = id_table,
.probe = usbtest_probe, .probe = usbtest_probe,
.ioctl = usbtest_ioctl, .unlocked_ioctl = usbtest_ioctl,
.disconnect = usbtest_disconnect, .disconnect = usbtest_disconnect,
.suspend = usbtest_suspend, .suspend = usbtest_suspend,
.resume = usbtest_resume, .resume = usbtest_resume,

2
include/linux/usb.h
View File

@@ -843,7 +843,7 @@ struct usb_driver {
void (*disconnect) (struct usb_interface *intf); void (*disconnect) (struct usb_interface *intf);
int (*ioctl) (struct usb_interface *intf, unsigned int code, int (*unlocked_ioctl) (struct usb_interface *intf, unsigned int code,
void *buf); void *buf);
int (*suspend) (struct usb_interface *intf, pm_message_t message); int (*suspend) (struct usb_interface *intf, pm_message_t message);