| From 843aa3cb83c1b5244a6870d6851d95b16c74aad0 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 16 Jul 2025 11:57:25 +0200 |
| Subject: net: ag71xx: Add missing check after DMA map |
| |
| From: Thomas Fourier <fourier.thomas@gmail.com> |
| |
| [ Upstream commit 96a1e15e60216b52da0e6da5336b6d7f5b0188b0 ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/atheros/ag71xx.c | 9 +++++++++ |
| 1 file changed, 9 insertions(+) |
| |
| diff --git a/drivers/net/ethernet/atheros/ag71xx.c b/drivers/net/ethernet/atheros/ag71xx.c |
| index 009e0b3066fa..baf12ae0b8c4 100644 |
| --- a/drivers/net/ethernet/atheros/ag71xx.c |
| +++ b/drivers/net/ethernet/atheros/ag71xx.c |
| @@ -1234,6 +1234,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; |
| } |
| @@ -1532,6 +1537,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); |
| -- |
| 2.39.5 |
| |
