diff options
author | Johan Hovold <johan@kernel.org> | 2017-10-04 05:01:13 -0400 |
---|---|---|
committer | Johan Hovold <johan@kernel.org> | 2017-10-09 06:33:31 -0400 |
commit | 299d7572e46f98534033a9e65973f13ad1ce9047 (patch) | |
tree | 79ddc0e00eb1354704502f41d3d6aa5a21b109a8 /drivers/usb/serial/console.c | |
parent | bd998c2e0df0469707503023d50d46cf0b10c787 (diff) |
USB: serial: console: fix use-after-free after failed setup
Make sure to reset the USB-console port pointer when console setup fails
in order to avoid having the struct usb_serial be prematurely freed by
the console code when the device is later disconnected.
Fixes: 73e487fdb75f ("[PATCH] USB console: fix disconnection issues")
Cc: stable <stable@vger.kernel.org> # 2.6.18
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/serial/console.c')
-rw-r--r-- | drivers/usb/serial/console.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c index ed8ba3ef5c79..43a862a90a77 100644 --- a/drivers/usb/serial/console.c +++ b/drivers/usb/serial/console.c | |||
@@ -186,6 +186,7 @@ static int usb_console_setup(struct console *co, char *options) | |||
186 | tty_kref_put(tty); | 186 | tty_kref_put(tty); |
187 | reset_open_count: | 187 | reset_open_count: |
188 | port->port.count = 0; | 188 | port->port.count = 0; |
189 | info->port = NULL; | ||
189 | usb_autopm_put_interface(serial->interface); | 190 | usb_autopm_put_interface(serial->interface); |
190 | error_get_interface: | 191 | error_get_interface: |
191 | usb_serial_put(serial); | 192 | usb_serial_put(serial); |