mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-27 22:51:31 +00:00
wifi: mwifiex: fix error recovery in PCIE buffer descriptor management
Add missing 'kfree_skb()' in 'mwifiex_init_rxq_ring()' and never do
'kfree(card->rxbd_ring_vbase)' because this area is DMAed and should
be released with 'dma_free_coherent()'. The latter is performed in
'mwifiex_pcie_delete_rxbd_ring()', which is now called to recover
from possible errors in 'mwifiex_pcie_create_rxbd_ring()'. Likewise
for 'mwifiex_pcie_init_evt_ring()', 'kfree(card->evtbd_ring_vbase)'
'mwifiex_pcie_delete_evtbd_ring()' and 'mwifiex_pcie_create_rxbd_ring()'.
Fixes: d930faee14
("mwifiex: add support for Marvell pcie8766 chipset")
Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
Acked-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230731074334.56463-1-dmantipov@yandex.ru
This commit is contained in:
parent
0701519fda
commit
288c63d5cb
1 changed files with 17 additions and 8 deletions
|
@ -189,6 +189,8 @@ static int mwifiex_pcie_probe_of(struct device *dev)
|
|||
}
|
||||
|
||||
static void mwifiex_pcie_work(struct work_struct *work);
|
||||
static int mwifiex_pcie_delete_rxbd_ring(struct mwifiex_adapter *adapter);
|
||||
static int mwifiex_pcie_delete_evtbd_ring(struct mwifiex_adapter *adapter);
|
||||
|
||||
static int
|
||||
mwifiex_map_pci_memory(struct mwifiex_adapter *adapter, struct sk_buff *skb,
|
||||
|
@ -792,14 +794,15 @@ static int mwifiex_init_rxq_ring(struct mwifiex_adapter *adapter)
|
|||
if (!skb) {
|
||||
mwifiex_dbg(adapter, ERROR,
|
||||
"Unable to allocate skb for RX ring.\n");
|
||||
kfree(card->rxbd_ring_vbase);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
if (mwifiex_map_pci_memory(adapter, skb,
|
||||
MWIFIEX_RX_DATA_BUF_SIZE,
|
||||
DMA_FROM_DEVICE))
|
||||
return -1;
|
||||
DMA_FROM_DEVICE)) {
|
||||
kfree_skb(skb);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
buf_pa = MWIFIEX_SKB_DMA_ADDR(skb);
|
||||
|
||||
|
@ -849,7 +852,6 @@ static int mwifiex_pcie_init_evt_ring(struct mwifiex_adapter *adapter)
|
|||
if (!skb) {
|
||||
mwifiex_dbg(adapter, ERROR,
|
||||
"Unable to allocate skb for EVENT buf.\n");
|
||||
kfree(card->evtbd_ring_vbase);
|
||||
return -ENOMEM;
|
||||
}
|
||||
skb_put(skb, MAX_EVENT_SIZE);
|
||||
|
@ -857,8 +859,7 @@ static int mwifiex_pcie_init_evt_ring(struct mwifiex_adapter *adapter)
|
|||
if (mwifiex_map_pci_memory(adapter, skb, MAX_EVENT_SIZE,
|
||||
DMA_FROM_DEVICE)) {
|
||||
kfree_skb(skb);
|
||||
kfree(card->evtbd_ring_vbase);
|
||||
return -1;
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
buf_pa = MWIFIEX_SKB_DMA_ADDR(skb);
|
||||
|
@ -1058,6 +1059,7 @@ static int mwifiex_pcie_delete_txbd_ring(struct mwifiex_adapter *adapter)
|
|||
*/
|
||||
static int mwifiex_pcie_create_rxbd_ring(struct mwifiex_adapter *adapter)
|
||||
{
|
||||
int ret;
|
||||
struct pcie_service_card *card = adapter->card;
|
||||
const struct mwifiex_pcie_card_reg *reg = card->pcie.reg;
|
||||
|
||||
|
@ -1096,7 +1098,10 @@ static int mwifiex_pcie_create_rxbd_ring(struct mwifiex_adapter *adapter)
|
|||
(u32)((u64)card->rxbd_ring_pbase >> 32),
|
||||
card->rxbd_ring_size);
|
||||
|
||||
return mwifiex_init_rxq_ring(adapter);
|
||||
ret = mwifiex_init_rxq_ring(adapter);
|
||||
if (ret)
|
||||
mwifiex_pcie_delete_rxbd_ring(adapter);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -1127,6 +1132,7 @@ static int mwifiex_pcie_delete_rxbd_ring(struct mwifiex_adapter *adapter)
|
|||
*/
|
||||
static int mwifiex_pcie_create_evtbd_ring(struct mwifiex_adapter *adapter)
|
||||
{
|
||||
int ret;
|
||||
struct pcie_service_card *card = adapter->card;
|
||||
const struct mwifiex_pcie_card_reg *reg = card->pcie.reg;
|
||||
|
||||
|
@ -1161,7 +1167,10 @@ static int mwifiex_pcie_create_evtbd_ring(struct mwifiex_adapter *adapter)
|
|||
(u32)((u64)card->evtbd_ring_pbase >> 32),
|
||||
card->evtbd_ring_size);
|
||||
|
||||
return mwifiex_pcie_init_evt_ring(adapter);
|
||||
ret = mwifiex_pcie_init_evt_ring(adapter);
|
||||
if (ret)
|
||||
mwifiex_pcie_delete_evtbd_ring(adapter);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in a new issue