aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2017-10-04 05:01:12 -0400
committerJohan Hovold <johan@kernel.org>2017-10-09 06:33:04 -0400
commitbd998c2e0df0469707503023d50d46cf0b10c787 (patch)
treee9bbaabbbff9b29fb10ddb76a24b8f618fd4fe89
parentf5d9644c5fca7d8e8972268598bb516a7eae17f9 (diff)
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.c2
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 = {
265 265
266void usb_serial_console_disconnect(struct usb_serial *serial) 266void usb_serial_console_disconnect(struct usb_serial *serial)
267{ 267{
268 if (serial->port[0] == usbcons_info.port) { 268 if (serial->port[0] && serial->port[0] == usbcons_info.port) {
269 usb_serial_console_exit(); 269 usb_serial_console_exit();
270 usb_serial_put(serial); 270 usb_serial_put(serial);
271 } 271 }