openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

usb-serial: don't release unregistered minors 

This patch (as1121) fixes a bug in the USB serial core.  When a device
is unregistered, the core will give back its minors -- even if the
device hasn't been assigned any!

The patch reserves the highest minor value (255) to mean that no minor
was assigned.  It also removes some dead code and does a small style
fixup.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alan Stern 2008-07-29 12:01:04 -04:00 committed by Greg Kroah-Hartman
parent e67d70f2f5
commit 0282b7f2a8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/usb/serial/usb-serial.c
View File

@ -122,9 +122,6 @@ static void return_serial(struct usb_serial *serial)
dbg("%s", __func__); dbg("%s", __func__);
if (serial == NULL)
return;
for (i = 0; i < serial->num_ports; ++i) for (i = 0; i < serial->num_ports; ++i)
serial_table[serial->minor + i] = NULL; serial_table[serial->minor + i] = NULL;
} }
@ -142,7 +139,8 @@ static void destroy_serial(struct kref *kref)
serial->type->shutdown(serial); serial->type->shutdown(serial);
/* return the minor range that this device had */ /* return the minor range that this device had */
return_serial(serial); if (serial->minor != SERIAL_TTY_NO_MINOR)
return_serial(serial);
for (i = 0; i < serial->num_ports; ++i) for (i = 0; i < serial->num_ports; ++i)
serial->port[i]->port.count = 0; serial->port[i]->port.count = 0;
@ -575,6 +573,7 @@ static struct usb_serial *create_serial(struct usb_device *dev,
serial->interface = interface; serial->interface = interface;
kref_init(&serial->kref); kref_init(&serial->kref);
mutex_init(&serial->disc_mutex); mutex_init(&serial->disc_mutex);
serial->minor = SERIAL_TTY_NO_MINOR;
return serial; return serial;
} }

3
include/linux/usb/serial.h
View File

@ -17,7 +17,8 @@
#include <linux/mutex.h> #include <linux/mutex.h>
#define SERIAL_TTY_MAJOR 188 /* Nice legal number now */ #define SERIAL_TTY_MAJOR 188 /* Nice legal number now */
#define SERIAL_TTY_MINORS 255 /* loads of devices :) */ #define SERIAL_TTY_MINORS 254 /* loads of devices :) */
#define SERIAL_TTY_NO_MINOR 255 /* No minor was assigned */
/* The maximum number of ports one device can grab at once */ /* The maximum number of ports one device can grab at once */
#define MAX_NUM_PORTS 8 #define MAX_NUM_PORTS 8