| From 500fb030da15ec118829da8998fcf2f41432ff90 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 2 Apr 2021 11:26:27 -0700 |
| Subject: mwl8k: Fix a double Free in mwl8k_probe_hw |
| |
| From: Lv Yunlong <lyl2019@mail.ustc.edu.cn> |
| |
| [ Upstream commit a8e083ee8e2a6c94c29733835adae8bf5b832748 ] |
| |
| 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: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/wireless/marvell/mwl8k.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| diff --git a/drivers/net/wireless/marvell/mwl8k.c b/drivers/net/wireless/marvell/mwl8k.c |
| index abf3b0233ccc..e98e7680eb53 100644 |
| --- a/drivers/net/wireless/marvell/mwl8k.c |
| +++ b/drivers/net/wireless/marvell/mwl8k.c |
| @@ -1474,6 +1474,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; |
| } |
| |
| -- |
| 2.30.2 |
| |