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

USB: Push BKL on open down into the drivers

Browse Source 
Straightforward push into the drivers to allow
auditing individual drivers separately

Signed-off-by: Oliver Neukum <oliver@neukum.org>
Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Oliver Neukum
2010-01-13 15:33:15 +01:00
committed by Greg Kroah-Hartman
parent f9de332ebf
commit 86266452f8
20 changed files with 99 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/usb/class/cdc-wdm.c
View File

@@ -19,6 +19,7 @@
#include <linux/uaccess.h>
#include <linux/bitops.h>
#include <linux/poll.h>
#include <linux/smp_lock.h>
#include <linux/usb.h>
#include <linux/usb/cdc.h>
#include <asm/byteorder.h>
@@ -516,6 +517,7 @@ static int wdm_open(struct inode *inode, struct file *file)
struct usb_interface *intf;
struct wdm_device *desc;
lock_kernel();
mutex_lock(&wdm_mutex);
intf = usb_find_interface(&wdm_driver, minor);
if (!intf)
@@ -548,6 +550,7 @@ static int wdm_open(struct inode *inode, struct file *file)
usb_autopm_put_interface(desc->intf);
out:
mutex_unlock(&wdm_mutex);
unlock_kernel();
return rv;
}

3
drivers/usb/class/usblp.c
View File

@@ -56,6 +56,7 @@
#include <linux/slab.h>
#include <linux/lp.h>
#include <linux/mutex.h>
#include <linux/smp_lock.h>
#undef DEBUG
#include <linux/usb.h>
@@ -395,6 +396,7 @@ static int usblp_open(struct inode *inode, struct file *file)
if (minor < 0)
return -ENODEV;
lock_kernel();
mutex_lock (&usblp_mutex);
retval = -ENODEV;
@@ -434,6 +436,7 @@ static int usblp_open(struct inode *inode, struct file *file)
}
out:
mutex_unlock (&usblp_mutex);
unlock_kernel();
return retval;
}

3
drivers/usb/class/usbtmc.c
View File

@@ -26,6 +26,7 @@
#include <linux/uaccess.h>
#include <linux/kref.h>
#include <linux/mutex.h>
#include <linux/smp_lock.h>
#include <linux/usb.h>
#include <linux/usb/tmc.h>
@@ -113,6 +114,7 @@ static int usbtmc_open(struct inode *inode, struct file *filp)
struct usbtmc_device_data *data;
int retval = 0;
lock_kernel();
intf = usb_find_interface(&usbtmc_driver, iminor(inode));
if (!intf) {
printk(KERN_ERR KBUILD_MODNAME
@@ -128,6 +130,7 @@ static int usbtmc_open(struct inode *inode, struct file *filp)
filp->private_data = data;
exit:
unlock_kernel();
return retval;
}