mwl8k: fix error handling in mwl8k_post_cmd()
authorAlexey Khoroshilov <khoroshilov@ispras.ru>
Fri, 5 Apr 2019 21:26:38 +0000 (00:26 +0300)
committerKalle Valo <kvalo@codeaurora.org>
Thu, 25 Apr 2019 16:51:46 +0000 (19:51 +0300)
If pci_map_single() fails in mwl8k_post_cmd(),
it returns -ENOMEM immediately, while cleanup is required.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/marvell/mwl8k.c

index 8e4e9b6..e0df51b 100644 (file)
@@ -2234,8 +2234,10 @@ static int mwl8k_post_cmd(struct ieee80211_hw *hw, struct mwl8k_cmd_pkt *cmd)
        dma_size = le16_to_cpu(cmd->length);
        dma_addr = pci_map_single(priv->pdev, cmd, dma_size,
                                  PCI_DMA_BIDIRECTIONAL);
-       if (pci_dma_mapping_error(priv->pdev, dma_addr))
-               return -ENOMEM;
+       if (pci_dma_mapping_error(priv->pdev, dma_addr)) {
+               rc = -ENOMEM;
+               goto exit;
+       }
 
        priv->hostcmd_wait = &cmd_wait;
        iowrite32(dma_addr, regs + MWL8K_HIU_GEN_PTR);
@@ -2275,6 +2277,7 @@ static int mwl8k_post_cmd(struct ieee80211_hw *hw, struct mwl8k_cmd_pkt *cmd)
                                     ms);
        }
 
+exit:
        if (bitmap)
                mwl8k_enable_bsses(hw, true, bitmap);