]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
net: ag71xx: Add missing check after DMA map
authorThomas Fourier <fourier.thomas@gmail.com>
Wed, 16 Jul 2025 09:57:25 +0000 (11:57 +0200)
committerJakub Kicinski <kuba@kernel.org>
Fri, 18 Jul 2025 01:59:44 +0000 (18:59 -0700)
The DMA map functions can fail and should be tested for errors.

Signed-off-by: Thomas Fourier <fourier.thomas@gmail.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20250716095733.37452-3-fourier.thomas@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/atheros/ag71xx.c

index d8e6f23e143201618f0a54f265b68f3aa3edfd48..cbc730c7cff298b3b18def890547ee1bab820171 100644 (file)
@@ -1213,6 +1213,11 @@ static bool ag71xx_fill_rx_buf(struct ag71xx *ag, struct ag71xx_buf *buf,
        buf->rx.rx_buf = data;
        buf->rx.dma_addr = dma_map_single(&ag->pdev->dev, data, ag->rx_buf_size,
                                          DMA_FROM_DEVICE);
+       if (dma_mapping_error(&ag->pdev->dev, buf->rx.dma_addr)) {
+               skb_free_frag(data);
+               buf->rx.rx_buf = NULL;
+               return false;
+       }
        desc->data = (u32)buf->rx.dma_addr + offset;
        return true;
 }
@@ -1511,6 +1516,10 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb,
 
        dma_addr = dma_map_single(&ag->pdev->dev, skb->data, skb->len,
                                  DMA_TO_DEVICE);
+       if (dma_mapping_error(&ag->pdev->dev, dma_addr)) {
+               netif_dbg(ag, tx_err, ndev, "DMA mapping error\n");
+               goto err_drop;
+       }
 
        i = ring->curr & ring_mask;
        desc = ag71xx_ring_desc(ring, i);