lkml.org 
[lkml]   [2019]   [Dec]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 024/161] staging: rtl8192u: fix multiple memory leaks on error path
    Date
    From: Navid Emamdoost <navid.emamdoost@gmail.com>

    [ Upstream commit ca312438cf176a16d4b89350cade8789ba8d7133 ]

    In rtl8192_tx on error handling path allocated urbs and also skb should
    be released.

    Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
    Link: https://lore.kernel.org/r/20190920025137.29407-1-navid.emamdoost@gmail.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/staging/rtl8192u/r8192U_core.c | 17 ++++++++++++-----
    1 file changed, 12 insertions(+), 5 deletions(-)

    diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c
    index db3eb7ec5809..fbbd1b59dc11 100644
    --- a/drivers/staging/rtl8192u/r8192U_core.c
    +++ b/drivers/staging/rtl8192u/r8192U_core.c
    @@ -1506,7 +1506,7 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb)
    (tx_fwinfo_819x_usb *)(skb->data + USB_HWDESC_HEADER_LEN);
    struct usb_device *udev = priv->udev;
    int pend;
    - int status;
    + int status, rt = -1;
    struct urb *tx_urb = NULL, *tx_urb_zero = NULL;
    unsigned int idx_pipe;

    @@ -1650,8 +1650,10 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb)
    }
    if (bSend0Byte) {
    tx_urb_zero = usb_alloc_urb(0, GFP_ATOMIC);
    - if (!tx_urb_zero)
    - return -ENOMEM;
    + if (!tx_urb_zero) {
    + rt = -ENOMEM;
    + goto error;
    + }
    usb_fill_bulk_urb(tx_urb_zero, udev,
    usb_sndbulkpipe(udev, idx_pipe),
    &zero, 0, tx_zero_isr, dev);
    @@ -1661,7 +1663,7 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb)
    "Error TX URB for zero byte %d, error %d",
    atomic_read(&priv->tx_pending[tcb_desc->queue_index]),
    status);
    - return -1;
    + goto error;
    }
    }
    netif_trans_update(dev);
    @@ -1672,7 +1674,12 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb)
    RT_TRACE(COMP_ERR, "Error TX URB %d, error %d",
    atomic_read(&priv->tx_pending[tcb_desc->queue_index]),
    status);
    - return -1;
    +
    +error:
    + dev_kfree_skb_any(skb);
    + usb_free_urb(tx_urb);
    + usb_free_urb(tx_urb_zero);
    + return rt;
    }

    static short rtl8192_usb_initendpoints(struct net_device *dev)
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-12-29 19:18    [W:4.091 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site