Commit 77198d72 authored by Oliver Neukum's avatar Oliver Neukum Committed by Greg Kroah-Hartman

USB: rio500: refuse more than one device at a time

commit 3864d339 upstream.

This driver is using a global variable. It cannot handle more than
one device at a time. The issue has been existing since the dawn
of the driver.
Signed-off-by: default avatarOliver Neukum <oneukum@suse.com>
Reported-by: syzbot+35f04d136fc975a70da4@syzkaller.appspotmail.com
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 47991232
...@@ -447,15 +447,23 @@ static int probe_rio(struct usb_interface *intf, ...@@ -447,15 +447,23 @@ static int probe_rio(struct usb_interface *intf,
{ {
struct usb_device *dev = interface_to_usbdev(intf); struct usb_device *dev = interface_to_usbdev(intf);
struct rio_usb_data *rio = &rio_instance; struct rio_usb_data *rio = &rio_instance;
int retval; int retval = 0;
mutex_lock(&rio500_mutex);
if (rio->present) {
dev_info(&intf->dev, "Second USB Rio at address %d refused\n", dev->devnum);
retval = -EBUSY;
goto bail_out;
} else {
dev_info(&intf->dev, "USB Rio found at address %d\n", dev->devnum); dev_info(&intf->dev, "USB Rio found at address %d\n", dev->devnum);
}
retval = usb_register_dev(intf, &usb_rio_class); retval = usb_register_dev(intf, &usb_rio_class);
if (retval) { if (retval) {
dev_err(&dev->dev, dev_err(&dev->dev,
"Not able to get a minor for this device.\n"); "Not able to get a minor for this device.\n");
return -ENOMEM; retval = -ENOMEM;
goto bail_out;
} }
rio->rio_dev = dev; rio->rio_dev = dev;
...@@ -464,7 +472,8 @@ static int probe_rio(struct usb_interface *intf, ...@@ -464,7 +472,8 @@ static int probe_rio(struct usb_interface *intf,
dev_err(&dev->dev, dev_err(&dev->dev,
"probe_rio: Not enough memory for the output buffer\n"); "probe_rio: Not enough memory for the output buffer\n");
usb_deregister_dev(intf, &usb_rio_class); usb_deregister_dev(intf, &usb_rio_class);
return -ENOMEM; retval = -ENOMEM;
goto bail_out;
} }
dev_dbg(&intf->dev, "obuf address:%p\n", rio->obuf); dev_dbg(&intf->dev, "obuf address:%p\n", rio->obuf);
...@@ -473,7 +482,8 @@ static int probe_rio(struct usb_interface *intf, ...@@ -473,7 +482,8 @@ static int probe_rio(struct usb_interface *intf,
"probe_rio: Not enough memory for the input buffer\n"); "probe_rio: Not enough memory for the input buffer\n");
usb_deregister_dev(intf, &usb_rio_class); usb_deregister_dev(intf, &usb_rio_class);
kfree(rio->obuf); kfree(rio->obuf);
return -ENOMEM; retval = -ENOMEM;
goto bail_out;
} }
dev_dbg(&intf->dev, "ibuf address:%p\n", rio->ibuf); dev_dbg(&intf->dev, "ibuf address:%p\n", rio->ibuf);
...@@ -481,8 +491,10 @@ static int probe_rio(struct usb_interface *intf, ...@@ -481,8 +491,10 @@ static int probe_rio(struct usb_interface *intf,
usb_set_intfdata (intf, rio); usb_set_intfdata (intf, rio);
rio->present = 1; rio->present = 1;
bail_out:
mutex_unlock(&rio500_mutex);
return 0; return retval;
} }
static void disconnect_rio(struct usb_interface *intf) static void disconnect_rio(struct usb_interface *intf)
......
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