summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2015-02-18 11:51:07 +0700
committerJohan Hovold <johan@kernel.org>2015-02-26 17:13:59 +0100
commitdb81de767e375743ebb0ad2bcad3326962c2b67e (patch)
treee4f1ed8f9696f35e408093f6be8e64c39c1a6bbb
parentd6f7f41274b548435ab5de1041a492fc4a714196 (diff)
downloadop-kernel-dev-db81de767e375743ebb0ad2bcad3326962c2b67e.zip
op-kernel-dev-db81de767e375743ebb0ad2bcad3326962c2b67e.tar.gz
USB: mxuport: fix null deref when used as a console
Fix null-pointer dereference at probe when the device is used as a console, in which case the tty argument to open will be NULL. Fixes: ee467a1f2066 ("USB: serial: add Moxa UPORT 12XX/14XX/16XX driver") Cc: stable <stable@vger.kernel.org> # v3.14 Signed-off-by: Johan Hovold <johan@kernel.org> Acked-by: Greg Kroah-Hartman <greg@kroah.com>
-rw-r--r--drivers/usb/serial/mxuport.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/serial/mxuport.c b/drivers/usb/serial/mxuport.c
index ab1d690..460a406 100644
--- a/drivers/usb/serial/mxuport.c
+++ b/drivers/usb/serial/mxuport.c
@@ -1284,7 +1284,8 @@ static int mxuport_open(struct tty_struct *tty, struct usb_serial_port *port)
}
/* Initial port termios */
- mxuport_set_termios(tty, port, NULL);
+ if (tty)
+ mxuport_set_termios(tty, port, NULL);
/*
* TODO: use RQ_VENDOR_GET_MSR, once we know what it
OpenPOWER on IntegriCloud