Skip to contentSkip to conversation

net: ti: icssg-prueth: fix missing data copy and wrong recycle in ZC RX dispatch

PATCH Applied David Carlier 3 participants 4 messages Mar 25 – Mar 27

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: ti: icssg-prueth: fix missing data copy and wrong recycle in ZC RX dispatch

emac_dispatch_skb_zc() allocates a new skb via napi_alloc_skb() but never copies the packet data from the XDP buffer into it. The skb is passed up the stack containing uninitialized heap memory instead of the actual received packet, leaking kernel heap contents to userspace.

Copy the received packet data from the XDP buffer into the skb using skb_copy_to_linear_data().

Additionally, remove the skb_mark_for_recycle() call since the skb is backed by the NAPI page frag allocator, not page_pool. Marking a non-page_pool skb for recycle causes the free path to return pages to a page_pool that does not own them, corrupting page_pool state.

The non-ZC path (emac_rx_packet) does not have these issues because it uses napi_build_skb() to wrap the existing page_pool page directly, requiring no copy, and correctly marks for recycle since the page comes from page_pool_dev_alloc_pages().

Fixes 7a64bb388df3 ("net: ti: icssg-prueth: Add AF_XDP zero copy for RX")
---
 drivers/net/ethernet/ti/icssg/icssg_common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/ti/icssg/icssg_common.c +1 -1
index fd4e7622f123..a28a608f9bf4 100644
@@ -902,6 +902,7 @@ static void emac_dispatch_skb_zc(struct prueth_emac *emac, struct xdp_buff *xdp,
 
 	skb_reserve(skb, headroom);
 	skb_put(skb, pkt_len);
+	skb_copy_to_linear_data(skb, xdp->data, pkt_len);
 	skb->dev = ndev;
 
 	/* RX HW timestamp */
@@ -912,7 +913,6 @@ static void emac_dispatch_skb_zc(struct prueth_emac *emac, struct xdp_buff *xdp,
 		skb->offload_fwd_mark = emac->offload_fwd_mark;
 	skb->protocol = eth_type_trans(skb, ndev);
 
-	skb_mark_for_recycle(skb);
 	napi_gro_receive(&emac->napi_rx, skb);
 	ndev->stats.rx_bytes += pkt_len;
 	ndev->stats.rx_packets++;
Signature · 1 line
2.53.0
reviewer Reviewed-by on v1 1/1
#1 lore raw

+ Meghana Malladi

Quoted 18 lines · David Carlier

emac_dispatch_skb_zc() allocates a new skb via napi_alloc_skb() but never copies the packet data from the XDP buffer into it. The skb is passed up the stack containing uninitialized heap memory instead of the actual received packet, leaking kernel heap contents to userspace.

Copy the received packet data from the XDP buffer into the skb using skb_copy_to_linear_data().

Additionally, remove the skb_mark_for_recycle() call since the skb is backed by the NAPI page frag allocator, not page_pool. Marking a non-page_pool skb for recycle causes the free path to return pages to a page_pool that does not own them, corrupting page_pool state.

The non-ZC path (emac_rx_packet) does not have these issues because it uses napi_build_skb() to wrap the existing page_pool page directly, requiring no copy, and correctly marks for recycle since the page comes from page_pool_dev_alloc_pages().

Quoted 5 lines
Fixes 7a64bb388df3 ("net: ti: icssg-prueth: Add AF_XDP zero copy for RX")
---
 drivers/net/ethernet/ti/icssg/icssg_common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Hi David,

Thanks for the update.
My understanding is that this addresses the review of v1.

v1: https://lore.kernel.org/all/[email protected]/

Some points to keep in mind for the future:

* Please include a version number in the subject when posting versions > This helps a lot in tracking things.

Subject: [PATCH v2] ...

* Please include the target tree. As a fix for code, which I asusme is present in net, in this case that would be the net tree.

Subject: [PATCH net v2] ...

Otherwise it would probably be the net-next tree.

* Please CC all relevant parties. In this case that would include Meghana as he provided review of v1.

* Please consider including a changelog, along with links to earlier versions below the scissors ("---")

* b4 can help with most of these things

* More information on the Netdev development process can be found at
https://docs.kernel.org/process/maintainer-netdev.html

...

#2 lore raw

Hi Simon and thanks for the feedback, will keep this in mind. Cheers !

Quoted 63 lines · Simon Horman

+ Meghana Malladi

Quoted 18 lines · David Carlier

emac_dispatch_skb_zc() allocates a new skb via napi_alloc_skb() but never copies the packet data from the XDP buffer into it. The skb is passed up the stack containing uninitialized heap memory instead of the actual received packet, leaking kernel heap contents to userspace.

Copy the received packet data from the XDP buffer into the skb using skb_copy_to_linear_data().

Additionally, remove the skb_mark_for_recycle() call since the skb is backed by the NAPI page frag allocator, not page_pool. Marking a non-page_pool skb for recycle causes the free path to return pages to a page_pool that does not own them, corrupting page_pool state.

The non-ZC path (emac_rx_packet) does not have these issues because it uses napi_build_skb() to wrap the existing page_pool page directly, requiring no copy, and correctly marks for recycle since the page comes from page_pool_dev_alloc_pages().

Quoted 5 lines
Fixes 7a64bb388df3 ("net: ti: icssg-prueth: Add AF_XDP zero copy for RX")
---
 drivers/net/ethernet/ti/icssg/icssg_common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Hi David,

Thanks for the update.
My understanding is that this addresses the review of v1.

v1: https://lore.kernel.org/all/[email protected]/

Some points to keep in mind for the future:

* Please include a version number in the subject when posting versions > This helps a lot in tracking things.

Subject: [PATCH v2] ...

* Please include the target tree. As a fix for code, which I asusme is present in net, in this case that would be the net tree.

Subject: [PATCH net v2] ...

Otherwise it would probably be the net-next tree.

* Please CC all relevant parties. In this case that would include Meghana as he provided review of v1.

* Please consider including a changelog, along with links to earlier versions below the scissors ("---")

* b4 can help with most of these things

* More information on the Netdev development process can be found at
https://docs.kernel.org/process/maintainer-netdev.html

...

#3 lore raw
In reply to David Carlier
This patch was applied to netdev/net.git (main) by David S. Miller <[email protected]>:

Hello:

This patch was applied to netdev/net.git (main)
by David S. Miller <[email protected]>:

Quoted 9 lines · On Wed, 25 Mar 2026 12:51:30 +0000 you wrote:

emac_dispatch_skb_zc() allocates a new skb via napi_alloc_skb() but never copies the packet data from the XDP buffer into it. The skb is passed up the stack containing uninitialized heap memory instead of the actual received packet, leaking kernel heap contents to userspace.

Copy the received packet data from the XDP buffer into the skb using skb_copy_to_linear_data().

[...]

Here is the summary with links:
- net: ti: icssg-prueth: fix missing data copy and wrong recycle in ZC RX dispatch

    https://git.kernel.org/netdev/net/c/5597dd284ff8

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html