From a8e083ee8e2a6c94c29733835adae8bf5b832748 Mon Sep 17 00:00:00 2001

From: Lv Yunlong <lyl2019@mail.ustc.edu.cn>

Date: Fri, 2 Apr 2021 11:26:27 -0700

Subject: [PATCH] mwl8k: Fix a double Free in mwl8k_probe_hw

Git-commit: a8e083ee8e2a6c94c29733835adae8bf5b832748

References: git-fixes

Patch-mainline: v5.13-rc1

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

Signed-off-by: Oliver Neukum <oneukum@suse.com>

---

 drivers/net/wireless/marvell/mwl8k.c |    1 +

 1 file changed, 1 insertion(+)

--- a/drivers/net/wireless/marvell/mwl8k.c

+++ b/drivers/net/wireless/marvell/mwl8k.c

@@ -1469,6 +1469,7 @@ static int mwl8k_txq_init(struct ieee802

 	txq->skb = kcalloc(MWL8K_TX_DESCS, sizeof(*txq->skb), GFP_KERNEL);

 	if (txq->skb == NULL) {

 		pci_free_consistent(priv->pdev, size, txq->txd, txq->txd_dma);

+		txq->txd = NULL;

 		return -ENOMEM;

 	}