提交 abc9c6ac 编写于 作者: N Navid Emamdoost 提交者: Xie XiuQi

mwifiex: pcie: Fix memory leak in mwifiex_pcie_init_evt_ring

mainline inclusion
from mainline-v5.4
commit d10dcb615c8e29d403a24d35f8310a7a53e3050c
category: bugfix
bugzilla: 13690
CVE: CVE-2019-19057

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

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: 0732484b ("mwifiex: separate ring initialization and ring creation routines")
Signed-off-by: NNavid Emamdoost <navid.emamdoost@gmail.com>
Acked-by: NGanapathi Bhat <gbhat@marvell.com>
Signed-off-by: NKalle Valo <kvalo@codeaurora.org>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
Reviewed-by: NWenan Mao <maowenan@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 906d0c26
...@@ -691,8 +691,11 @@ static int mwifiex_pcie_init_evt_ring(struct mwifiex_adapter *adapter) ...@@ -691,8 +691,11 @@ static int mwifiex_pcie_init_evt_ring(struct mwifiex_adapter *adapter)
skb_put(skb, MAX_EVENT_SIZE); skb_put(skb, MAX_EVENT_SIZE);
if (mwifiex_map_pci_memory(adapter, 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; return -1;
}
buf_pa = MWIFIEX_SKB_DMA_ADDR(skb); buf_pa = MWIFIEX_SKB_DMA_ADDR(skb);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册