]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mwl8k: Add missing check after DMA map
authorThomas Fourier <fourier.thomas@gmail.com>
Wed, 9 Jul 2025 11:13:34 +0000 (13:13 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 15 Aug 2025 10:04:58 +0000 (12:04 +0200)
[ Upstream commit 50459501b9a212dbe7a673727589ee105a8a9954 ]

The DMA map functions can fail and should be tested for errors.
If the mapping fails, unmap and return an error.

Fixes: 788838ebe8a4 ("mwl8k: use pci_unmap_addr{,set}() to keep track of unmap addresses on rx")
Signed-off-by: Thomas Fourier <fourier.thomas@gmail.com>
Link: https://patch.msgid.link/20250709111339.25360-2-fourier.thomas@gmail.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/marvell/mwl8k.c

index 61697dad4ea614387853087a43122b0e7b08ea84..cc3a9543d255e0cc847f4cb7fa81bcd6f5bc6133 100644 (file)
@@ -1222,6 +1222,10 @@ static int rxq_refill(struct ieee80211_hw *hw, int index, int limit)
 
                addr = dma_map_single(&priv->pdev->dev, skb->data,
                                      MWL8K_RX_MAXSZ, DMA_FROM_DEVICE);
+               if (dma_mapping_error(&priv->pdev->dev, addr)) {
+                       kfree_skb(skb);
+                       break;
+               }
 
                rxq->rxd_count++;
                rx = rxq->tail++;