Commit db5c8b52 authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman

USB: fix port probing and removal in garmin_gps

This patch (as1615) fixes a bug in the Garmin USB serial driver.  It
uses attach, disconnect, and release routines to carry out actions
that should be handled by port_probe and port_remove routines, because
they access port-specific data.

The bug causes an oops when the device in unplugged, because the
private data for each port structure now gets erased when the port is
unbound from the driver, resulting in a null-pointer dereference.
Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Reported--by: default avatarMarkus Schauler <mschauler@gmail.com>
Tested-by: default avatarMarkus Schauler <mschauler@gmail.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8bf769eb
...@@ -1405,11 +1405,10 @@ static void timeout_handler(unsigned long data) ...@@ -1405,11 +1405,10 @@ static void timeout_handler(unsigned long data)
static int garmin_attach(struct usb_serial *serial) static int garmin_port_probe(struct usb_serial_port *port)
{ {
int status = 0; int status;
struct usb_serial_port *port = serial->port[0]; struct garmin_data *garmin_data_p;
struct garmin_data *garmin_data_p = NULL;
garmin_data_p = kzalloc(sizeof(struct garmin_data), GFP_KERNEL); garmin_data_p = kzalloc(sizeof(struct garmin_data), GFP_KERNEL);
if (garmin_data_p == NULL) { if (garmin_data_p == NULL) {
...@@ -1434,22 +1433,14 @@ static int garmin_attach(struct usb_serial *serial) ...@@ -1434,22 +1433,14 @@ static int garmin_attach(struct usb_serial *serial)
} }
static void garmin_disconnect(struct usb_serial *serial) static int garmin_port_remove(struct usb_serial_port *port)
{ {
struct usb_serial_port *port = serial->port[0];
struct garmin_data *garmin_data_p = usb_get_serial_port_data(port); struct garmin_data *garmin_data_p = usb_get_serial_port_data(port);
usb_kill_urb(port->interrupt_in_urb); usb_kill_urb(port->interrupt_in_urb);
del_timer_sync(&garmin_data_p->timer); del_timer_sync(&garmin_data_p->timer);
}
static void garmin_release(struct usb_serial *serial)
{
struct usb_serial_port *port = serial->port[0];
struct garmin_data *garmin_data_p = usb_get_serial_port_data(port);
kfree(garmin_data_p); kfree(garmin_data_p);
return 0;
} }
...@@ -1466,9 +1457,8 @@ static struct usb_serial_driver garmin_device = { ...@@ -1466,9 +1457,8 @@ static struct usb_serial_driver garmin_device = {
.close = garmin_close, .close = garmin_close,
.throttle = garmin_throttle, .throttle = garmin_throttle,
.unthrottle = garmin_unthrottle, .unthrottle = garmin_unthrottle,
.attach = garmin_attach, .port_probe = garmin_port_probe,
.disconnect = garmin_disconnect, .port_remove = garmin_port_remove,
.release = garmin_release,
.write = garmin_write, .write = garmin_write,
.write_room = garmin_write_room, .write_room = garmin_write_room,
.write_bulk_callback = garmin_write_bulk_callback, .write_bulk_callback = garmin_write_bulk_callback,
......
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