mwifiex: pcie: Fix memory leak in mwifiex_pcie_init_evt_ring
authorNavid Emamdoost <navid.emamdoost@gmail.com>
Fri, 4 Oct 2019 20:16:48 +0000 (15:16 -0500)
committerKalle Valo <kvalo@codeaurora.org>
Wed, 9 Oct 2019 08:25:22 +0000 (11:25 +0300)
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>
drivers/net/wireless/marvell/mwifiex/pcie.c

index 1578eaa071bd3abefb58fb8cda35584c20ed5855..fc1706d0647d7ea8c3fae9e16c8e8ba61a27485a 100644 (file)
@@ -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);