lkml.org 
[lkml]   [2020]   [Dec]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 05/54] USB: serial: kl5kusb105: fix memleak on open
    Date
    From: Johan Hovold <johan@kernel.org>

    commit 3f203f057edfcf6bd02c6b942799262bfcf31f73 upstream.

    Fix memory leak of control-message transfer buffer on successful open().

    Fixes: 6774d5f53271 ("USB: serial: kl5kusb105: fix open error path")
    Cc: stable@vger.kernel.org
    Signed-off-by: Johan Hovold <johan@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/usb/serial/kl5kusb105.c | 10 ++++------
    1 file changed, 4 insertions(+), 6 deletions(-)

    --- a/drivers/usb/serial/kl5kusb105.c
    +++ b/drivers/usb/serial/kl5kusb105.c
    @@ -276,12 +276,12 @@ static int klsi_105_open(struct tty_str
    priv->cfg.unknown2 = cfg->unknown2;
    spin_unlock_irqrestore(&priv->lock, flags);

    + kfree(cfg);
    +
    /* READ_ON and urb submission */
    rc = usb_serial_generic_open(tty, port);
    - if (rc) {
    - retval = rc;
    - goto err_free_cfg;
    - }
    + if (rc)
    + return rc;

    rc = usb_control_msg(port->serial->dev,
    usb_sndctrlpipe(port->serial->dev, 0),
    @@ -324,8 +324,6 @@ err_disable_read:
    KLSI_TIMEOUT);
    err_generic_close:
    usb_serial_generic_close(port);
    -err_free_cfg:
    - kfree(cfg);

    return retval;
    }

    \
     
     \ /
      Last update: 2020-12-10 16:52    [W:4.168 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site