Skip to content

Commit bd998c2

Browse files
committed
USB: serial: console: fix use-after-free on disconnect
A clean-up patch removing two redundant NULL-checks from the console disconnect handler inadvertently also removed a third check. This could lead to the struct usb_serial being prematurely freed by the console code when a driver accepts but does not register any ports for an interface which also lacks endpoint descriptors. Fixes: 0e517c9 ("USB: serial: console: clean up sanity checks") Cc: stable <[email protected]> # 4.11 Reported-by: Andrey Konovalov <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Johan Hovold <[email protected]>
1 parent f5d9644 commit bd998c2

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/usb/serial/console.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ static struct console usbcons = {
265265

266266
void usb_serial_console_disconnect(struct usb_serial *serial)
267267
{
268-
if (serial->port[0] == usbcons_info.port) {
268+
if (serial->port[0] && serial->port[0] == usbcons_info.port) {
269269
usb_serial_console_exit();
270270
usb_serial_put(serial);
271271
}

0 commit comments

Comments
 (0)