USB: serial: fix interface refcounting

jhovold · gregkh · commit d7971051e4df · 2013-03-21T15:59:02.000-07:00
Make sure the interface is not released before our serial device.

Note that drivers are still not allowed to access the interface in
any way that may interfere with another driver that may have gotten
bound to the same interface after disconnect returns.

Cc: stable &lt;stable@vger.kernel.org&gt;
Signed-off-by: Johan Hovold &lt;jhovold@gmail.com&gt;
Signed-off-by: Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
@@ -151,6 +151,7 @@ static void destroy_serial(struct kref *kref)
 		}
 	}
 
+	usb_put_intf(serial->interface);
 	usb_put_dev(serial->dev);
 	kfree(serial);
 }
@@ -620,7 +621,7 @@ static struct usb_serial *create_serial(struct usb_device *dev,
 	}
 	serial->dev = usb_get_dev(dev);
 	serial->type = driver;
-	serial->interface = interface;
+	serial->interface = usb_get_intf(interface);
 	kref_init(&serial->kref);
 	mutex_init(&serial->disc_mutex);
 	serial->minor = SERIAL_TTY_NO_MINOR;

Original file line number	Diff line number	Diff line change
`@@ -151,6 +151,7 @@ static void destroy_serial(struct kref *kref)`
`151`	`151`	`}`
`152`	`152`	`}`
`153`	`153`
	`154`	`+ usb_put_intf(serial->interface);`
`154`	`155`	`usb_put_dev(serial->dev);`
`155`	`156`	`kfree(serial);`
`156`	`157`	`}`
`@@ -620,7 +621,7 @@ static struct usb_serial create_serial(struct usb_device dev,`
`620`	`621`	`}`
`621`	`622`	`serial->dev = usb_get_dev(dev);`
`622`	`623`	`serial->type = driver;`
`623`		`- serial->interface = interface;`
	`624`	`+ serial->interface = usb_get_intf(interface);`
`624`	`625`	`kref_init(&serial->kref);`
`625`	`626`	`mutex_init(&serial->disc_mutex);`
`626`	`627`	`serial->minor = SERIAL_TTY_NO_MINOR;`