lkml.org 
[lkml]   [2017]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.10 109/167] can: usb_8dev: Fix memory leak of priv->cmd_msg_buffer
    Date
    4.10-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Marc Kleine-Budde <mkl@pengutronix.de>

    commit 7c42631376306fb3f34d51fda546b50a9b6dd6ec upstream.

    The priv->cmd_msg_buffer is allocated in the probe function, but never
    kfree()ed. This patch converts the kzalloc() to resource-managed
    kzalloc.

    Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/net/can/usb/usb_8dev.c | 9 +++------
    1 file changed, 3 insertions(+), 6 deletions(-)

    --- a/drivers/net/can/usb/usb_8dev.c
    +++ b/drivers/net/can/usb/usb_8dev.c
    @@ -951,8 +951,8 @@ static int usb_8dev_probe(struct usb_int
    for (i = 0; i < MAX_TX_URBS; i++)
    priv->tx_contexts[i].echo_index = MAX_TX_URBS;

    - priv->cmd_msg_buffer = kzalloc(sizeof(struct usb_8dev_cmd_msg),
    - GFP_KERNEL);
    + priv->cmd_msg_buffer = devm_kzalloc(&intf->dev, sizeof(struct usb_8dev_cmd_msg),
    + GFP_KERNEL);
    if (!priv->cmd_msg_buffer)
    goto cleanup_candev;

    @@ -966,7 +966,7 @@ static int usb_8dev_probe(struct usb_int
    if (err) {
    netdev_err(netdev,
    "couldn't register CAN device: %d\n", err);
    - goto cleanup_cmd_msg_buffer;
    + goto cleanup_candev;
    }

    err = usb_8dev_cmd_version(priv, &version);
    @@ -987,9 +987,6 @@ static int usb_8dev_probe(struct usb_int
    cleanup_unregister_candev:
    unregister_netdev(priv->netdev);

    -cleanup_cmd_msg_buffer:
    - kfree(priv->cmd_msg_buffer);
    -
    cleanup_candev:
    free_candev(netdev);


    \
     
     \ /
      Last update: 2017-03-10 11:00    [W:2.239 / U:0.608 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site