diff options
| author | Johan Hovold <johan@kernel.org> | 2020-01-17 10:50:22 +0100 |
|---|---|---|
| committer | Johan Hovold <johan@kernel.org> | 2020-01-17 16:22:45 +0100 |
| commit | 4d5ef53f75c22d28f490bcc5c771fcc610a9afa4 (patch) | |
| tree | 7629efab2d95c94ae872f2ef411f68a9b35559f8 | |
| parent | fdb838efa31e1ed9a13ae6ad0b64e30fdbd00570 (diff) | |
| download | linux-4d5ef53f75c22d28f490bcc5c771fcc610a9afa4.tar.bz2 | |
USB: serial: ch341: handle unbound port at reset_resume
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>
| -rw-r--r-- | drivers/usb/serial/ch341.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c index df582fe855f0..d3f420f3a083 100644 --- a/drivers/usb/serial/ch341.c +++ b/drivers/usb/serial/ch341.c @@ -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); |