USB: Push BKL on open down into the drivers

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>

USB: Push BKL on open down into the drivers
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>
Oliver Neukum · Greg Kroah-Hartman
1 parent f9de332ebf
Showing 20 changed files with 99 additions and 15 deletions Side-by-side Diff
drivers/hid/usbhid/hiddev.c
drivers/media/video/dabusb.c
drivers/staging/frontier/alphatrack.c
drivers/staging/frontier/tranzport.c
drivers/usb/class/cdc-wdm.c
drivers/usb/class/usblp.c
drivers/usb/class/usbtmc.c
drivers/usb/core/file.c
drivers/usb/image/mdc800.c
drivers/usb/misc/adutux.c
drivers/usb/misc/ftdi-elan.c
drivers/usb/misc/idmouse.c
drivers/usb/misc/iowarrior.c
drivers/usb/misc/ldusb.c
drivers/usb/misc/legousbtower.c
drivers/usb/misc/rio500.c
drivers/usb/misc/sisusbvga/sisusb.c
drivers/usb/misc/usblcd.c
drivers/usb/misc/vstusb.c
drivers/usb/usb-skeleton.c
@@ -265,9 +265,10 @@
 static int hiddev_open(struct inode *inode, struct file *file)
 {
 	struct hiddev_list *list;
-	int res;
+	int res, i;
  
-	int i = iminor(inode) - HIDDEV_MINOR_BASE;
+	lock_kernel();
+	i = iminor(inode) - HIDDEV_MINOR_BASE;
  
 	if (i >= HIDDEV_MINORS || i < 0 || !hiddev_table[i])
 		return -ENODEV;
  
@@ -313,10 +314,12 @@
 			usbhid_open(hid);
 		}
  
+	unlock_kernel();
 	return 0;
 bail:
 	file->private_data = NULL;
 	kfree(list);
+	unlock_kernel();
 	return res;
 }
  
@@ -616,10 +616,12 @@
 {
 	int devnum = iminor(inode);
 	pdabusb_t s;
+	int r;
  
 	if (devnum < DABUSB_MINOR || devnum >= (DABUSB_MINOR + NRDABUSB))
 		return -EIO;
  
+	lock_kernel();
 	s = &dabusb[devnum - DABUSB_MINOR];
  
 	dbg("dabusb_open");
@@ -634,6 +636,7 @@
 		msleep_interruptible(500);
  
 		if (signal_pending (current)) {
+			unlock_kernel();
 			return -EAGAIN;
 		}
 		mutex_lock(&s->mutex);
@@ -641,6 +644,7 @@
 	if (usb_set_interface (s->usbdev, _DABUSB_IF, 1) < 0) {
 		mutex_unlock(&s->mutex);
 		dev_err(&s->usbdev->dev, "set_interface failed\n");
+		unlock_kernel();
 		return -EINVAL;
 	}
 	s->opened = 1;
@@ -649,7 +653,9 @@
 	file->f_pos = 0;
 	file->private_data = s;
  
-	return nonseekable_open(inode, file);
+	r = nonseekable_open(inode, file);
+	unlock_kernel();
+	return r;
 }
  
 static int dabusb_release (struct inode *inode, struct file *file)
@@ -41,6 +41,7 @@
 #include <linux/mutex.h>
  
 #include <linux/uaccess.h>
+#include <linux/smp_lock.h>
 #include <linux/input.h>
 #include <linux/usb.h>
 #include <linux/poll.h>
@@ -325,6 +326,7 @@
 	int retval = 0;
 	struct usb_interface *interface;
  
+	lock_kernel();
 	nonseekable_open(inode, file);
 	subminor = iminor(inode);
  
@@ -394,6 +396,7 @@
  
 unlock_disconnect_exit:
 	mutex_unlock(&disconnect_mutex);
+	unlock_kernel();
  
 	return retval;
 }
@@ -40,6 +40,7 @@
 #include <linux/mutex.h>
  
 #include <linux/uaccess.h>
+#include <linux/smp_lock.h>
 #include <linux/input.h>
 #include <linux/usb.h>
 #include <linux/poll.h>
@@ -343,6 +344,7 @@
 	int retval = 0;
 	struct usb_interface *interface;
  
+	lock_kernel();
 	nonseekable_open(inode, file);
 	subminor = iminor(inode);
  
@@ -413,6 +415,7 @@
  
 unlock_disconnect_exit:
 	mutex_unlock(&disconnect_mutex);
+	unlock_kernel();
  
 	return retval;
 }
@@ -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 @@
 	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 @@
 	usb_autopm_put_interface(desc->intf);
 out:
 	mutex_unlock(&wdm_mutex);
+	unlock_kernel();
 	return rv;
 }
  
@@ -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 @@
 	if (minor < 0)
 		return -ENODEV;
  
+	lock_kernel();
 	mutex_lock (&usblp_mutex);
  
 	retval = -ENODEV;
@@ -434,6 +436,7 @@
 	}
 out:
 	mutex_unlock (&usblp_mutex);
+	unlock_kernel();
 	return retval;
 }
  
@@ -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 @@
 	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 @@
 	filp->private_data = data;
  
 exit:
+	unlock_kernel();
 	return retval;
 }
  
@@ -34,7 +34,6 @@
 	int err = -ENODEV;
 	const struct file_operations *old_fops, *new_fops = NULL;
  
-	lock_kernel();
 	down_read(&minor_rwsem);
 	c = usb_minors[minor];
  
@@ -53,7 +52,6 @@
 	fops_put(old_fops);
  done:
 	up_read(&minor_rwsem);
-	unlock_kernel();
 	return err;
 }
  
@@ -96,6 +96,7 @@
 #include <linux/module.h>
 #include <linux/wait.h>
 #include <linux/mutex.h>
+#include <linux/smp_lock.h>
  
 #include <linux/usb.h>
 #include <linux/fs.h>
@@ -622,6 +623,7 @@
 	int retval=0;
 	int errn=0;
  
+	lock_kernel();
 	mutex_lock(&mdc800->io_lock);
  
 	if (mdc800->state == NOT_CONNECTED)
@@ -660,6 +662,7 @@
  
 error_out:
 	mutex_unlock(&mdc800->io_lock);
+	unlock_kernel();
 	return errn;
 }
  
@@ -25,6 +25,7 @@
 #include <linux/module.h>
 #include <linux/usb.h>
 #include <linux/mutex.h>
+#include <linux/smp_lock.h>
 #include <asm/uaccess.h>
  
 #ifdef CONFIG_USB_DEBUG
@@ -274,6 +275,7 @@
  
 	dbg(2,"%s : enter", __func__);
  
+	lock_kernel();
 	subminor = iminor(inode);
  
 	if ((retval = mutex_lock_interruptible(&adutux_mutex))) {
@@ -332,6 +334,7 @@
 exit_no_device:
 	mutex_unlock(&adutux_mutex);
 exit_no_lock:
+	unlock_kernel();
 	dbg(2,"%s : leave, return value %d ", __func__, retval);
 	return retval;
 }
@@ -45,6 +45,7 @@
 #include <linux/module.h>
 #include <linux/kref.h>
 #include <linux/mutex.h>
+#include <linux/smp_lock.h>
 #include <asm/uaccess.h>
 #include <linux/usb.h>
 #include <linux/workqueue.h>
  
  
  
  
@@ -623,22 +624,30 @@
 */
 static int ftdi_elan_open(struct inode *inode, struct file *file)
 {
-        int subminor = iminor(inode);
-        struct usb_interface *interface = usb_find_interface(&ftdi_elan_driver,
-                subminor);
+	int subminor;
+	struct usb_interface *interface;
+
+	lock_kernel();
+        subminor = iminor(inode);
+        interface = usb_find_interface(&ftdi_elan_driver, subminor);
+
         if (!interface) {
+		unlock_kernel();
                 printk(KERN_ERR "can't find device for minor %d\n", subminor);
                 return -ENODEV;
         } else {
                 struct usb_ftdi *ftdi = usb_get_intfdata(interface);
                 if (!ftdi) {
+			unlock_kernel();
                         return -ENODEV;
                 } else {
                         if (down_interruptible(&ftdi->sw_lock)) {
+				unlock_kernel();
                                 return -EINTR;
                         } else {
                                 ftdi_elan_get_kref(ftdi);
                                 file->private_data = ftdi;
+				unlock_kernel();
                                 return 0;
                         }
                 }
@@ -24,6 +24,7 @@
 #include <linux/module.h>
 #include <linux/completion.h>
 #include <linux/mutex.h>
+#include <linux/smp_lock.h>
 #include <asm/uaccess.h>
 #include <linux/usb.h>
  
  
  
  
@@ -226,16 +227,20 @@
 	struct usb_interface *interface;
 	int result;
  
+	lock_kernel();
 	/* get the interface from minor number and driver information */
 	interface = usb_find_interface (&idmouse_driver, iminor (inode));
-	if (!interface)
+	if (!interface) {
+		unlock_kernel();
 		return -ENODEV;
+	}
  
 	mutex_lock(&open_disc_mutex);
 	/* get the device information block from the interface */
 	dev = usb_get_intfdata(interface);
 	if (!dev) {
 		mutex_unlock(&open_disc_mutex);
+		unlock_kernel();
 		return -ENODEV;
 	}
  
@@ -272,6 +277,7 @@
  
 	/* unlock this device */
 	mutex_unlock(&dev->lock);
+	unlock_kernel();
 	return result;
 }
  
@@ -602,10 +602,12 @@
  
 	dbg("%s", __func__);
  
+	lock_kernel();
 	subminor = iminor(inode);
  
 	interface = usb_find_interface(&iowarrior_driver, subminor);
 	if (!interface) {
+		unlock_kernel();
 		err("%s - error, can't find device for minor %d", __func__,
 		    subminor);
 		return -ENODEV;
@@ -615,6 +617,7 @@
 	dev = usb_get_intfdata(interface);
 	if (!dev) {
 		mutex_unlock(&iowarrior_open_disc_lock);
+		unlock_kernel();
 		return -ENODEV;
 	}
  
@@ -641,6 +644,7 @@
  
 out:
 	mutex_unlock(&dev->mutex);
+	unlock_kernel();
 	return retval;
 }
  
@@ -33,6 +33,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
+#include <linux/smp_lock.h>
  
 #include <asm/uaccess.h>
 #include <linux/input.h>
  
@@ -296,12 +297,14 @@
 	int retval;
 	struct usb_interface *interface;
  
+	lock_kernel();
 	nonseekable_open(inode, file);
 	subminor = iminor(inode);
  
 	interface = usb_find_interface(&ld_usb_driver, subminor);
  
 	if (!interface) {
+		unlock_kernel();
 		err("%s - error, can't find device for minor %d\n",
 		     __func__, subminor);
 		return -ENODEV;
  
  
  
@@ -309,12 +312,16 @@
  
 	dev = usb_get_intfdata(interface);
  
-	if (!dev)
+	if (!dev) {
+		unlock_kernel();
 		return -ENODEV;
+	}
  
 	/* lock this device */
-	if (mutex_lock_interruptible(&dev->mutex))
+	if (mutex_lock_interruptible(&dev->mutex)) {
+		unlock_kernel();
 		return -ERESTARTSYS;
+	}
  
 	/* allow opening only once */
 	if (dev->open_count) {
@@ -353,6 +360,7 @@
  
 unlock_exit:
 	mutex_unlock(&dev->mutex);
+	unlock_kernel();
  
 	return retval;
 }
@@ -82,6 +82,7 @@
 #include <linux/module.h>
 #include <linux/completion.h>
 #include <linux/mutex.h>
+#include <linux/smp_lock.h>
 #include <asm/uaccess.h>
 #include <linux/usb.h>
 #include <linux/poll.h>
@@ -345,6 +346,7 @@
  
 	dbg(2, "%s: enter", __func__);
  
+	lock_kernel();
 	nonseekable_open(inode, file);
 	subminor = iminor(inode);
  
@@ -430,6 +432,7 @@
 	mutex_unlock(&dev->lock);
  
 exit:
+	unlock_kernel();
 	dbg(2, "%s: leave, return value %d ", __func__, retval);
  
 	return retval;
@@ -77,7 +77,7 @@
 static int open_rio(struct inode *inode, struct file *file)
 {
 	struct rio_usb_data *rio = &rio_instance;
-
+	lock_kernel();
 	mutex_lock(&(rio->lock));
  
 	if (rio->isopen || !rio->present) {
@@ -91,6 +91,7 @@
 	mutex_unlock(&(rio->lock));
  
 	dev_info(&rio->rio_dev->dev, "Rio opened.\n");
+	unlock_kernel();
  
 	return 0;
 }
@@ -2416,21 +2416,28 @@
 	struct usb_interface *interface;
 	int subminor = iminor(inode);
  
-	if (!(interface = usb_find_interface(&sisusb_driver, subminor)))
+	lock_kernel();
+	if (!(interface = usb_find_interface(&sisusb_driver, subminor))) {
+		unlock_kernel();
 		return -ENODEV;
+	}
  
-	if (!(sisusb = usb_get_intfdata(interface)))
+	if (!(sisusb = usb_get_intfdata(interface))) {
+		unlock_kernel();
 		return -ENODEV;
+	}
  
 	mutex_lock(&sisusb->lock);
  
 	if (!sisusb->present || !sisusb->ready) {
 		mutex_unlock(&sisusb->lock);
+		unlock_kernel();
 		return -ENODEV;
 	}
  
 	if (sisusb->isopen) {
 		mutex_unlock(&sisusb->lock);
+		unlock_kernel();
 		return -EBUSY;
 	}
  
  
@@ -2439,11 +2446,13 @@
 			if (sisusb_init_gfxdevice(sisusb, 0)) {
 				mutex_unlock(&sisusb->lock);
 				dev_err(&sisusb->sisusb_dev->dev, "Failed to initialize device\n");
+				unlock_kernel();
 				return -EIO;
 			}
 		} else {
 			mutex_unlock(&sisusb->lock);
 			dev_err(&sisusb->sisusb_dev->dev, "Device not attached to USB 2.0 hub\n");
+			unlock_kernel();
 			return -EIO;
 		}
 	}
@@ -2456,6 +2465,7 @@
 	file->private_data = sisusb;
  
 	mutex_unlock(&sisusb->lock);
+	unlock_kernel();
  
 	return 0;
 }
@@ -74,10 +74,12 @@
 	struct usb_interface *interface;
 	int subminor, r;
  
+	lock_kernel();
 	subminor = iminor(inode);
  
 	interface = usb_find_interface(&lcd_driver, subminor);
 	if (!interface) {
+		unlock_kernel();
 		err ("USBLCD: %s - error, can't find device for minor %d",
 		     __func__, subminor);
 		return -ENODEV;
@@ -87,6 +89,7 @@
 	dev = usb_get_intfdata(interface);
 	if (!dev) {
 		mutex_unlock(&open_disc_mutex);
+		unlock_kernel();
 		return -ENODEV;
 	}
  
  
@@ -98,11 +101,13 @@
 	r = usb_autopm_get_interface(interface);
 	if (r < 0) {
 		kref_put(&dev->kref, lcd_delete);
+		unlock_kernel();
 		return r;
 	}
  
 	/* save our object in the file's private structure */
 	file->private_data = dev;
+	unlock_kernel();
  
 	return 0;
 }
@@ -27,6 +27,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
+#include <linux/smp_lock.h>
 #include <linux/uaccess.h>
 #include <linux/usb.h>
  
  
  
  
@@ -103,19 +104,23 @@
 	struct vstusb_device *vstdev;
 	struct usb_interface *interface;
  
+	lock_kernel();
 	interface = usb_find_interface(&vstusb_driver, iminor(inode));
  
 	if (!interface) {
 		printk(KERN_ERR KBUILD_MODNAME
 		       ": %s - error, can't find device for minor %d\n",
 		       __func__, iminor(inode));
+		unlock_kernel();
 		return -ENODEV;
 	}
  
 	vstdev = usb_get_intfdata(interface);
  
-	if (!vstdev)
+	if (!vstdev) {
+		unlock_kernel();
 		return -ENODEV;
+	}
  
 	/* lock this device */
 	mutex_lock(&vstdev->lock);
@@ -123,6 +128,7 @@
 	/* can only open one time */
 	if ((!vstdev->present) || (vstdev->isopen)) {
 		mutex_unlock(&vstdev->lock);
+		unlock_kernel();
 		return -EBUSY;
 	}
  
@@ -137,6 +143,7 @@
 	dev_dbg(&vstdev->usb_dev->dev, "%s: opened\n", __func__);
  
 	mutex_unlock(&vstdev->lock);
+	unlock_kernel();
  
 	return 0;
 }
@@ -18,6 +18,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/kref.h>
+#include <linux/smp_lock.h>
 #include <linux/uaccess.h>
 #include <linux/usb.h>
 #include <linux/mutex.h>
@@ -90,6 +91,7 @@
 	int subminor;
 	int retval = 0;
  
+	lock_kernel();
 	subminor = iminor(inode);
  
 	interface = usb_find_interface(&skel_driver, subminor);
@@ -135,6 +137,7 @@
 	mutex_unlock(&dev->io_mutex);
  
 exit:
+	unlock_kernel();
 	return retval;
 }
...	...	@@ -265,9 +265,10 @@
265	265	static int hiddev_open(struct inode inode, struct file file)
266	266	{
267	267	struct hiddev_list *list;
268		- int res;
	268	+ int res, i;
269	269
270		- int i = iminor(inode) - HIDDEV_MINOR_BASE;
	270	+ lock_kernel();
	271	+ i = iminor(inode) - HIDDEV_MINOR_BASE;
271	272
272	273	if (i >= HIDDEV_MINORS \|\| i < 0 \|\| !hiddev_table[i])
273	274	return -ENODEV;
274	275
...	...	@@ -313,10 +314,12 @@
313	314	usbhid_open(hid);
314	315	}
315	316
	317	+ unlock_kernel();
316	318	return 0;
317	319	bail:
318	320	file->private_data = NULL;
319	321	kfree(list);
	322	+ unlock_kernel();
320	323	return res;
321	324	}
322	325
...	...	@@ -616,10 +616,12 @@
616	616	{
617	617	int devnum = iminor(inode);
618	618	pdabusb_t s;
	619	+ int r;
619	620
620	621	if (devnum < DABUSB_MINOR \|\| devnum >= (DABUSB_MINOR + NRDABUSB))
621	622	return -EIO;
622	623
	624	+ lock_kernel();
623	625	s = &dabusb[devnum - DABUSB_MINOR];
624	626
625	627	dbg("dabusb_open");
...	...	@@ -634,6 +636,7 @@
634	636	msleep_interruptible(500);
635	637
636	638	if (signal_pending (current)) {
	639	+ unlock_kernel();
637	640	return -EAGAIN;
638	641	}
639	642	mutex_lock(&s->mutex);
...	...	@@ -641,6 +644,7 @@
641	644	if (usb_set_interface (s->usbdev, _DABUSB_IF, 1) < 0) {
642	645	mutex_unlock(&s->mutex);
643	646	dev_err(&s->usbdev->dev, "set_interface failed\n");
	647	+ unlock_kernel();
644	648	return -EINVAL;
645	649	}
646	650	s->opened = 1;
...	...	@@ -649,7 +653,9 @@
649	653	file->f_pos = 0;
650	654	file->private_data = s;
651	655
652		- return nonseekable_open(inode, file);
	656	+ r = nonseekable_open(inode, file);
	657	+ unlock_kernel();
	658	+ return r;
653	659	}
654	660
655	661	static int dabusb_release (struct inode inode, struct file file)
...	...	@@ -41,6 +41,7 @@
41	41	#include <linux/mutex.h>
42	42
43	43	#include <linux/uaccess.h>
	44	+#include <linux/smp_lock.h>
44	45	#include <linux/input.h>
45	46	#include <linux/usb.h>
46	47	#include <linux/poll.h>
...	...	@@ -325,6 +326,7 @@
325	326	int retval = 0;
326	327	struct usb_interface *interface;
327	328
	329	+ lock_kernel();
328	330	nonseekable_open(inode, file);
329	331	subminor = iminor(inode);
330	332
...	...	@@ -394,6 +396,7 @@
394	396
395	397	unlock_disconnect_exit:
396	398	mutex_unlock(&disconnect_mutex);
	399	+ unlock_kernel();
397	400
398	401	return retval;
399	402	}
...	...	@@ -40,6 +40,7 @@
40	40	#include <linux/mutex.h>
41	41
42	42	#include <linux/uaccess.h>
	43	+#include <linux/smp_lock.h>
43	44	#include <linux/input.h>
44	45	#include <linux/usb.h>
45	46	#include <linux/poll.h>
...	...	@@ -343,6 +344,7 @@
343	344	int retval = 0;
344	345	struct usb_interface *interface;
345	346
	347	+ lock_kernel();
346	348	nonseekable_open(inode, file);
347	349	subminor = iminor(inode);
348	350
...	...	@@ -413,6 +415,7 @@
413	415
414	416	unlock_disconnect_exit:
415	417	mutex_unlock(&disconnect_mutex);
	418	+ unlock_kernel();
416	419
417	420	return retval;
418	421	}
...	...	@@ -19,6 +19,7 @@
19	19	#include <linux/uaccess.h>
20	20	#include <linux/bitops.h>
21	21	#include <linux/poll.h>
	22	+#include <linux/smp_lock.h>
22	23	#include <linux/usb.h>
23	24	#include <linux/usb/cdc.h>
24	25	#include <asm/byteorder.h>
...	...	@@ -516,6 +517,7 @@
516	517	struct usb_interface *intf;
517	518	struct wdm_device *desc;
518	519
	520	+ lock_kernel();
519	521	mutex_lock(&wdm_mutex);
520	522	intf = usb_find_interface(&wdm_driver, minor);
521	523	if (!intf)
...	...	@@ -548,6 +550,7 @@
548	550	usb_autopm_put_interface(desc->intf);
549	551	out:
550	552	mutex_unlock(&wdm_mutex);
	553	+ unlock_kernel();
551	554	return rv;
552	555	}
553	556
...	...	@@ -56,6 +56,7 @@
56	56	#include <linux/slab.h>
57	57	#include <linux/lp.h>
58	58	#include <linux/mutex.h>
	59	+#include <linux/smp_lock.h>
59	60	#undef DEBUG
60	61	#include <linux/usb.h>
61	62
...	...	@@ -395,6 +396,7 @@
395	396	if (minor < 0)
396	397	return -ENODEV;
397	398
	399	+ lock_kernel();
398	400	mutex_lock (&usblp_mutex);
399	401
400	402	retval = -ENODEV;
...	...	@@ -434,6 +436,7 @@
434	436	}
435	437	out:
436	438	mutex_unlock (&usblp_mutex);
	439	+ unlock_kernel();
437	440	return retval;
438	441	}
439	442
...	...	@@ -26,6 +26,7 @@
26	26	#include <linux/uaccess.h>
27	27	#include <linux/kref.h>
28	28	#include <linux/mutex.h>
	29	+#include <linux/smp_lock.h>
29	30	#include <linux/usb.h>
30	31	#include <linux/usb/tmc.h>
31	32
...	...	@@ -113,6 +114,7 @@
113	114	struct usbtmc_device_data *data;
114	115	int retval = 0;
115	116
	117	+ lock_kernel();
116	118	intf = usb_find_interface(&usbtmc_driver, iminor(inode));
117	119	if (!intf) {
118	120	printk(KERN_ERR KBUILD_MODNAME
...	...	@@ -128,6 +130,7 @@
128	130	filp->private_data = data;
129	131
130	132	exit:
	133	+ unlock_kernel();
131	134	return retval;
132	135	}
133	136
...	...	@@ -34,7 +34,6 @@
34	34	int err = -ENODEV;
35	35	const struct file_operations old_fops, new_fops = NULL;
36	36
37		- lock_kernel();
38	37	down_read(&minor_rwsem);
39	38	c = usb_minors[minor];
40	39
...	...	@@ -53,7 +52,6 @@
53	52	fops_put(old_fops);
54	53	done:
55	54	up_read(&minor_rwsem);
56		- unlock_kernel();
57	55	return err;
58	56	}
59	57
...	...	@@ -96,6 +96,7 @@
96	96	#include <linux/module.h>
97	97	#include <linux/wait.h>
98	98	#include <linux/mutex.h>
	99	+#include <linux/smp_lock.h>
99	100
100	101	#include <linux/usb.h>
101	102	#include <linux/fs.h>
...	...	@@ -622,6 +623,7 @@
622	623	int retval=0;
623	624	int errn=0;
624	625
	626	+ lock_kernel();
625	627	mutex_lock(&mdc800->io_lock);
626	628
627	629	if (mdc800->state == NOT_CONNECTED)
...	...	@@ -660,6 +662,7 @@
660	662
661	663	error_out:
662	664	mutex_unlock(&mdc800->io_lock);
	665	+ unlock_kernel();
663	666	return errn;
664	667	}
665	668
...	...	@@ -25,6 +25,7 @@
25	25	#include <linux/module.h>
26	26	#include <linux/usb.h>
27	27	#include <linux/mutex.h>
	28	+#include <linux/smp_lock.h>
28	29	#include <asm/uaccess.h>
29	30
30	31	#ifdef CONFIG_USB_DEBUG
...	...	@@ -274,6 +275,7 @@
274	275
275	276	dbg(2,"%s : enter", __func__);
276	277
	278	+ lock_kernel();
277	279	subminor = iminor(inode);
278	280
279	281	if ((retval = mutex_lock_interruptible(&adutux_mutex))) {
...	...	@@ -332,6 +334,7 @@
332	334	exit_no_device:
333	335	mutex_unlock(&adutux_mutex);
334	336	exit_no_lock:
	337	+ unlock_kernel();
335	338	dbg(2,"%s : leave, return value %d ", __func__, retval);
336	339	return retval;
337	340	}