Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1717282 authored by Alexey Khoroshilov's avatar Alexey Khoroshilov Committed by Kalle Valo
Browse files

mwl8k: fix error handling in mwl8k_post_cmd() 



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: default avatarAlexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent b25105e1

drivers/net/wireless/marvell/mwl8k.c

+5 −2
Original line number Diff line number Diff line
@@ -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);