USB: serial: ch341: handle unbound port at reset_resume
authorJohan Hovold <johan@kernel.org>
Fri, 17 Jan 2020 09:50:22 +0000 (10:50 +0100)
committerJohan Hovold <johan@kernel.org>
Fri, 17 Jan 2020 15:22:45 +0000 (16:22 +0100)
Check for NULL port data in reset_resume() to avoid dereferencing a NULL
pointer in case the port device isn't bound to a driver (e.g. after a
failed control request at port probe).

Fixes: 1ded7ea47b88 ("USB: ch341 serial: fix port number changed after resume")
Cc: stable <stable@vger.kernel.org> # 2.6.30
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
drivers/usb/serial/ch341.c

index df582fe855f06b727aa517487703177ccfbf8d79..d3f420f3a083570d4d3372514c39430caa9fc8d8 100644 (file)
@@ -642,9 +642,13 @@ static int ch341_tiocmget(struct tty_struct *tty)
 static int ch341_reset_resume(struct usb_serial *serial)
 {
        struct usb_serial_port *port = serial->port[0];
-       struct ch341_private *priv = usb_get_serial_port_data(port);
+       struct ch341_private *priv;
        int ret;
 
+       priv = usb_get_serial_port_data(port);
+       if (!priv)
+               return 0;
+
        /* reconfigure ch341 serial port after bus-reset */
        ch341_configure(serial->dev, priv);