diff options
| author | Johan Hovold <johan@kernel.org> | 2015-02-18 05:51:07 +0100 |
|---|---|---|
| committer | Johan Hovold <johan@kernel.org> | 2015-02-26 17:13:59 +0100 |
| commit | db81de767e375743ebb0ad2bcad3326962c2b67e (patch) | |
| tree | e4f1ed8f9696f35e408093f6be8e64c39c1a6bbb | |
| parent | USB: serial: clean up bus probe error handling (diff) | |
| download | linux-db81de767e375743ebb0ad2bcad3326962c2b67e.tar.xz linux-db81de767e375743ebb0ad2bcad3326962c2b67e.zip | |
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.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/serial/mxuport.c b/drivers/usb/serial/mxuport.c index ab1d690274ae..460a40669967 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 |