mwl8k: Fix a double Free in mwl8k_probe_hw
authorLv Yunlong <lyl2019@mail.ustc.edu.cn>
Fri, 2 Apr 2021 18:26:27 +0000 (11:26 -0700)
committerKalle Valo <kvalo@codeaurora.org>
Sun, 18 Apr 2021 06:35:06 +0000 (09:35 +0300)
In mwl8k_probe_hw, hw->priv->txq is freed at the first time by
dma_free_coherent() in the call chain:
if(!priv->ap_fw)->mwl8k_init_txqs(hw)->mwl8k_txq_init(hw, i).

Then in err_free_queues of mwl8k_probe_hw, hw->priv->txq is freed
at the second time by mwl8k_txq_deinit(hw, i)->dma_free_coherent().

My patch set txq->txd to NULL after the first free to avoid the
double free.

Fixes: a66098daacee2 ("mwl8k: Marvell TOPDOG wireless driver")
Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210402182627.4256-1-lyl2019@mail.ustc.edu.cn
drivers/net/wireless/marvell/mwl8k.c

index c9f8c05..84b32a5 100644 (file)
@@ -1473,6 +1473,7 @@ static int mwl8k_txq_init(struct ieee80211_hw *hw, int index)
        if (txq->skb == NULL) {
                dma_free_coherent(&priv->pdev->dev, size, txq->txd,
                                  txq->txd_dma);
+               txq->txd = NULL;
                return -ENOMEM;
        }