mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Federico Musto <federico@rimpianto.com>
To: chris.snook@gmail.com, netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org,
	Federico Musto <federico@rimpianto.com>
Subject: [PATCH net] net: atl1c: free the RX buffer when the descriptor reports an error
Date: Tue, 27 Oct 2026 12:51:56 +0100	[thread overview]
Message-ID: <20261027115156.17128-1-federico@rimpianto.com> (raw)

atl1c_clean_rx() drops a frame whose return descriptor carries
RRS_RX_ERR_SUM or RRS_802_3_LEN_ERR by calling atl1c_clean_rfd(), which
only marks the RFD free and clears the skb pointer.  Nothing unmaps the DMA
mapping and nothing frees the skb, so every errored frame - CRC, alignment,
truncation, runt - leaks one skb and one DMA mapping.  The driver uses a
32-bit DMA mask, so on a host without an IOMMU each of those mappings also
pins a swiotlb slot.

Unmap and free before the RFD is recycled, the same way the good path does.
The hardware already counts these frames in its own error counters, which
atl1c_get_stats() reports, so no software counter is added here.

Fixes: 43250ddd75a3 ("atl1c: Atheros L1C Gigabit Ethernet driver")
Cc: stable@vger.kernel.org
Signed-off-by: Federico Musto <federico@rimpianto.com>
---
Spotted while reviewing a fix for a different problem in the same function
(skb_over_panic on oversized RX frames), by the Sashiko review bot.  It is
independent of that patch and applies on its own.

The guard on buffer_info->skb is there because the slot can be empty after a
reset; rfd_num != 1 stays on the old path, since multi-RFD is not supported
by this driver anywhere else either.
---
 drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
index e58f1d2..2d68955 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
@@ -1908,6 +1908,23 @@ static int atl1c_clean_rx(struct napi_struct *napi, int budget)
 rrs_checked:
 		atl1c_clean_rrd(rrd_ring, rrs, rfd_num);
 		if (rrs->word3 & (RRS_RX_ERR_SUM | RRS_802_3_LEN_ERR)) {
+			/* The RFD is recycled below, and that drops the only
+			 * pointer to the buffer: unmap and free it first, or the
+			 * skb and its DMA mapping leak on every errored frame.
+			 */
+			if (likely(rfd_num == 1)) {
+				rfd_index = (rrs->word0 >> RRS_RX_RFD_INDEX_SHIFT) &
+						RRS_RX_RFD_INDEX_MASK;
+				buffer_info = &rfd_ring->buffer_info[rfd_index];
+				if (buffer_info->skb) {
+					dma_unmap_single(&pdev->dev,
+							 buffer_info->dma,
+							 buffer_info->length,
+							 DMA_FROM_DEVICE);
+					kfree_skb_reason(buffer_info->skb,
+							 SKB_DROP_REASON_NOT_SPECIFIED);
+				}
+			}
 			atl1c_clean_rfd(rfd_ring, rrs, rfd_num);
 			if (netif_msg_rx_err(adapter))
 				dev_warn(&pdev->dev,
-- 
2.54.0 (Apple Git-157)


             reply	other threads:[~2026-10-27 12:08 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-27 11:51 Federico Musto [this message]
2026-10-27 12:10 ` netdev-bot+sinfo
2026-10-27 12:11   ` Federico Musto

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261027115156.17128-1-federico@rimpianto.com \
    --to=federico@rimpianto.com \
    --cc=chris.snook@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®