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 5.4 115/434] mwifiex: pcie: Fix memory leak in mwifiex_pcie_init_evt_ring
    Date
    From: Navid Emamdoost <navid.emamdoost@gmail.com>

    [ Upstream commit d10dcb615c8e29d403a24d35f8310a7a53e3050c ]

    In mwifiex_pcie_init_evt_ring, a new skb is allocated which should be
    released if mwifiex_map_pci_memory() fails. The release for skb and
    card->evtbd_ring_vbase is added.

    Fixes: 0732484b47b5 ("mwifiex: separate ring initialization and ring creation routines")
    Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
    Acked-by: Ganapathi Bhat <gbhat@marvell.com>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/marvell/mwifiex/pcie.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
    index eff06d59e9df..096334e941a1 100644
    --- a/drivers/net/wireless/marvell/mwifiex/pcie.c
    +++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
    @@ -687,8 +687,11 @@ static int mwifiex_pcie_init_evt_ring(struct mwifiex_adapter *adapter)
    skb_put(skb, MAX_EVENT_SIZE);

    if (mwifiex_map_pci_memory(adapter, skb, MAX_EVENT_SIZE,
    - PCI_DMA_FROMDEVICE))
    + PCI_DMA_FROMDEVICE)) {
    + kfree_skb(skb);
    + kfree(card->evtbd_ring_vbase);
    return -1;
    + }

    buf_pa = MWIFIEX_SKB_DMA_ADDR(skb);

    --
    2.20.1


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