lkml.org 
[lkml]   [2017]   [Jan]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 112/235] USB: serial: kl5kusb105: abort on open exception path
    Date
    From: Pan Bian <bianpan2016@163.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit 3c3dd1e058cb01e835dcade4b54a6f13ffaeaf7c upstream.

    Function klsi_105_open() calls usb_control_msg() (to "enable read") and
    checks its return value. When the return value is unexpected, it only
    assigns the error code to the return variable retval, but does not
    terminate the exception path. This patch fixes the bug by inserting
    "goto err_generic_close;" when the call to usb_control_msg() fails.

    Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
    Signed-off-by: Pan Bian <bianpan2016@163.com>
    [johan: rebase on prerequisite fix and amend commit message]
    Signed-off-by: Johan Hovold <johan@kernel.org>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/usb/serial/kl5kusb105.c | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c
    index 70e163d21e9a..69eb056dd6ea 100644
    --- a/drivers/usb/serial/kl5kusb105.c
    +++ b/drivers/usb/serial/kl5kusb105.c
    @@ -319,6 +319,7 @@ static int klsi_105_open(struct tty_struct *tty, struct usb_serial_port *port)
    if (rc < 0) {
    dev_err(&port->dev, "Enabling read failed (error = %d)\n", rc);
    retval = rc;
    + goto err_generic_close;
    } else
    dev_dbg(&port->dev, "%s - enabled reading\n", __func__);

    @@ -345,6 +346,7 @@ err_disable_read:
    0, /* index */
    NULL, 0,
    KLSI_TIMEOUT);
    +err_generic_close:
    usb_serial_generic_close(port);
    err_free_cfg:
    kfree(cfg);
    --
    2.11.0
    \
     
     \ /
      Last update: 2017-01-27 12:47    [W:5.289 / U:0.360 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site