diff options
| author | Johan Hovold <johan@kernel.org> | 2017-10-04 11:01:12 +0200 |
|---|---|---|
| committer | Johan Hovold <johan@kernel.org> | 2017-10-09 12:33:04 +0200 |
| commit | bd998c2e0df0469707503023d50d46cf0b10c787 (patch) | |
| tree | e9bbaabbbff9b29fb10ddb76a24b8f618fd4fe89 | |
| parent | f5d9644c5fca7d8e8972268598bb516a7eae17f9 (diff) | |
| download | linux-bd998c2e0df0469707503023d50d46cf0b10c787.tar.gz linux-bd998c2e0df0469707503023d50d46cf0b10c787.tar.xz | |
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: 0e517c93dc02 ("USB: serial: console: clean up sanity checks")
Cc: stable <stable@vger.kernel.org> # 4.11
Reported-by: Andrey Konovalov <andreyknvl@google.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
| -rw-r--r-- | drivers/usb/serial/console.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c index fdf89800ebc3..ed8ba3ef5c79 100644 --- a/drivers/usb/serial/console.c +++ b/drivers/usb/serial/console.c @@ -265,7 +265,7 @@ static struct console usbcons = { void usb_serial_console_disconnect(struct usb_serial *serial) { - if (serial->port[0] == usbcons_info.port) { + if (serial->port[0] && serial->port[0] == usbcons_info.port) { usb_serial_console_exit(); usb_serial_put(serial); } |