lkml.org 
[lkml]   [2020]   [Jan]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 048/222] USB: serial: ch341: handle unbound port at reset_resume
    Date
    From: Johan Hovold <johan@kernel.org>

    commit 4d5ef53f75c22d28f490bcc5c771fcc610a9afa4 upstream.

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/usb/serial/ch341.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    --- a/drivers/usb/serial/ch341.c
    +++ b/drivers/usb/serial/ch341.c
    @@ -589,9 +589,13 @@ static int ch341_tiocmget(struct tty_str
    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);


    \
     
     \ /
      Last update: 2020-01-22 14:32    [W:5.038 / U:0.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site