summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2017-10-04 11:01:13 +0200
committerJin Qian <jinqian@android.com>2017-11-16 10:53:39 -0800
commit6b680316209548e7565e4273d0fc7a01ac0adfd8 (patch)
tree3f66fc5050dfd58c2c6312e24e69c4c92de47ad6
parent36735f30c65a22238d462d8d19029cabaf089437 (diff)
downloadtegra-6b680316209548e7565e4273d0fc7a01ac0adfd8.tar.gz
UPSTREAM: USB: serial: console: fix use-after-free after failed setup
commit 299d7572e46f98534033a9e65973f13ad1ce9047 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. Change-Id: I46e86fddd10611a30e7f4ab62ba07dc6eccc0312 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>
-rw-r--r--drivers/usb/serial/console.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
index 5f3bcd31e204..f3bbe210119d 100644
--- a/drivers/usb/serial/console.c
+++ b/drivers/usb/serial/console.c
@@ -188,6 +188,7 @@ static int usb_console_setup(struct console *co, char *options)
kfree(tty);
reset_open_count:
port->port.count = 0;
+ info->port = NULL;
usb_autopm_put_interface(serial->interface);
error_get_interface:
usb_serial_put(serial);