mirror of
https://github.com/torvalds/linux.git
synced 2024-11-25 05:32:00 +00:00
USB: open disconnect race in iowarrior
the driver sets intfdata to NULL without lock. Data structures can be freed and accessed. Signed-off-by: Oliver Neukum <oneukum@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
5919a43bbc
commit
03f36e885f
@ -66,6 +66,7 @@ module_param(debug, bool, 0644);
|
||||
MODULE_PARM_DESC(debug, "debug=1 enables debugging messages");
|
||||
|
||||
static struct usb_driver iowarrior_driver;
|
||||
static DEFINE_MUTEX(iowarrior_open_disc_lock);
|
||||
|
||||
/*--------------*/
|
||||
/* data */
|
||||
@ -608,11 +609,15 @@ static int iowarrior_open(struct inode *inode, struct file *file)
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
mutex_lock(&iowarrior_open_disc_lock);
|
||||
dev = usb_get_intfdata(interface);
|
||||
if (!dev)
|
||||
if (!dev) {
|
||||
mutex_unlock(&iowarrior_open_disc_lock);
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
mutex_lock(&dev->mutex);
|
||||
mutex_unlock(&iowarrior_open_disc_lock);
|
||||
|
||||
/* Only one process can open each device, no sharing. */
|
||||
if (dev->opened) {
|
||||
@ -866,6 +871,7 @@ static void iowarrior_disconnect(struct usb_interface *interface)
|
||||
int minor;
|
||||
|
||||
dev = usb_get_intfdata(interface);
|
||||
mutex_lock(&iowarrior_open_disc_lock);
|
||||
usb_set_intfdata(interface, NULL);
|
||||
|
||||
minor = dev->minor;
|
||||
@ -879,6 +885,7 @@ static void iowarrior_disconnect(struct usb_interface *interface)
|
||||
dev->present = 0;
|
||||
|
||||
mutex_unlock(&dev->mutex);
|
||||
mutex_unlock(&iowarrior_open_disc_lock);
|
||||
|
||||
if (dev->opened) {
|
||||
/* There is a process that holds a filedescriptor to the device ,
|
||||
|
Loading…
Reference in New Issue
Block a user