veth: convert frag_list skbs before running XDP
Subsystems (4)
PATCH v3 1/1 veth: convert frag_list skbs before running XDP
From: Matt Fleming <[email protected]>
A frag_list skb can reach veth with data_len set but nr_frags zero. veth_convert_skb_to_xdp_buff() only converts skbs that are shared, locked, have frags[], or do not have enough headroom. It later uses skb_is_nonlinear() to decide whether to set XDP_FLAGS_HAS_FRAGS and xdp_frags_size.
That exposes frag_list data to XDP as if it were stored in frags[], but frags[] is empty. AF_XDP copy mode can then trust the bogus XDP fragment metadata, walk an empty fragment entry, and crash in memcpy() from __xsk_rcv().
Route non-linear skbs through skb_pp_cow_data() before exposing them to XDP, and only advertise XDP frags when the resulting skb has frags[]. skb_copy_bits() already handles frag_list input, and skb_pp_cow_data() builds frags[] output with skb_add_rx_frag(), which is the representation XDP multi-buffer expects.
---
Changes in v3:
- Target net instead of bpf.
- Add Return: to the skb_pp_cow_data() kerneldoc.
Changes in v2:
- Use skb_is_nonlinear() in veth_convert_skb_to_xdp_buff().
- Move the skb_pp_cow_data() comment into kerneldoc.
drivers/net/veth.c | 4 ++-- net/core/skbuff.c | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-)
drivers/net/veth.c +2 -2
@@ -756,7 +756,7 @@ static int veth_convert_skb_to_xdp_buff(struct veth_rq *rq,u32 frame_sz;if (skb_shared (skb) ||skb_head_is_locked (skb) || -skb_shinfo (skb)->nr_frags || +skb_is_nonlinear (skb) ||skb_headroom (skb) <XDP_PACKET_HEADROOM ) {if (skb_pp_cow_data (rq->page_pool, pskb,XDP_PACKET_HEADROOM )) goto drop;
@@ -771,7 +771,7 @@ static int veth_convert_skb_to_xdp_buff(struct veth_rq *rq,xdp_prepare_buff (xdp, skb->head,skb_headroom (skb),skb_headlen (skb), true); -if (skb_is_nonlinear (skb)) { +if (skb_shinfo (skb)->nr_frags) {skb_shinfo (skb)->xdp_frags_size = skb->data_len;xdp_buff_set_frags_flag (xdp); }else {
net/core/skbuff.c +12 -6
@@ -927,6 +927,18 @@ static void skb_clone_fraglist(struct sk_buff *skb)skb_get (list); } +/** +* skb_pp_cow_data() - copy skb data into page-pool backed storage +* @pool: page pool to allocate from +* @pskb: pointer to skb pointer, replaced with the copied skb on success +* @headroom: headroom to reserve in the copied skb +* +* skb_copy_bits() handles both frags[] and frag_list input. If the copied +* skb remains non-linear, it uses frags[], which is the representation used +* by XDP multi-buffer. +* +* Return: 0 on success or a negative errno on failure. +*/ int skb_pp_cow_data (struct page_pool *pool,struct sk_buff **pskb,unsigned int headroom) {
@@ -936,12 +948,6 @@ int skb_pp_cow_data(struct page_pool *pool, struct sk_buff **pskb,int err, i, head_off;void *data; -/* XDP does not support fraglist so we need to linearize -* the skb. -*/ -if (skb_has_frag_list (skb)) -return -EOPNOTSUPP ; - max_head_size =SKB_WITH_OVERHEAD (PAGE_SIZE - headroom);if (skb->len > max_head_size +MAX_SKB_FRAGS *PAGE_SIZE )return -ENOMEM ;
Signature · 1 line
2.43.0
Quoted 19 lines · Matt Fleming
From: Matt Fleming <[email protected]>
A
frag_listskb can reach veth withdata_lenset butnr_fragszero.veth_convert_skb_to_xdp_buff()only converts skbs that are shared, locked, have frags[], or do not have enough headroom. It later usesskb_is_nonlinear()to decide whether to setXDP_FLAGS_HAS_FRAGSandxdp_frags_size.That exposes
frag_listdata to XDP as if it were stored in frags[], but frags[] is empty.AF_XDPcopy mode can then trust the bogus XDP fragment metadata, walk an empty fragment entry, and crash inmemcpy()from__xsk_rcv().Route non-linear skbs through
skb_pp_cow_data()before exposing them to XDP, and only advertise XDP frags when the resulting skb has frags[].skb_copy_bits()already handlesfrag_listinput, andskb_pp_cow_data()builds frags[] output withskb_add_rx_frag(), which is the representation XDP multi-buffer expects.
Quoted 3 lines
Fixes 718a18a0c8a6 ("veth: Rework veth_xdp_rcv_skb in order to accept non-linear skb")Signed-off-by Matt Fleming <[email protected]>
Please retain tags when respinning.
Quoted 4 lines · Toke Høiland-Jørgensen
Please retain tags when respinning.
Reviewed-by Toke Høiland-Jørgensen <[email protected]>
My bad :) Will be sure to keep them next time.
Thanks,
Matt
Quoted 19 lines
From: Matt Fleming <[email protected]>
A
frag_listskb can reach veth withdata_lenset butnr_fragszero.veth_convert_skb_to_xdp_buff()only converts skbs that are shared, locked, have frags[], or do not have enough headroom. It later usesskb_is_nonlinear()to decide whether to setXDP_FLAGS_HAS_FRAGSandxdp_frags_size.That exposes
frag_listdata to XDP as if it were stored in frags[], but frags[] is empty.AF_XDPcopy mode can then trust the bogus XDP fragment metadata, walk an empty fragment entry, and crash inmemcpy()from__xsk_rcv().Route non-linear skbs through
skb_pp_cow_data()before exposing them to XDP, and only advertise XDP frags when the resulting skb has frags[].skb_copy_bits()already handlesfrag_listinput, andskb_pp_cow_data()builds frags[] output withskb_add_rx_frag(), which is the representation XDP multi-buffer expects.
Quoted 3 lines
Fixes 718a18a0c8a6 ("veth: Rework veth_xdp_rcv_skb in order to accept non-linear skb")Signed-off-by Matt Fleming <[email protected]>
Quoted 74 lines
---
Changes in v3:
- Target net instead of bpf.
- Add Return: to theskb_pp_cow_data()kerneldoc.Changes in v2:
- Useskb_is_nonlinear()inveth_convert_skb_to_xdp_buff().
- Move theskb_pp_cow_data()comment into kerneldoc.drivers/net/veth.c | 4 ++-- net/core/skbuff.c | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-)drivers/net/veth.c +2
-2@@ -756,7 +756,7 @@ static int veth_convert_skb_to_xdp_buff(struct veth_rq *rq,u32 frame_sz;if (skb_shared (skb) ||skb_head_is_locked (skb) || -skb_shinfo (skb)->nr_frags || +skb_is_nonlinear (skb) ||skb_headroom (skb) <XDP_PACKET_HEADROOM ) {if (skb_pp_cow_data (rq->page_pool, pskb,XDP_PACKET_HEADROOM )) goto drop;@@ -771,7 +771,7 @@ static int veth_convert_skb_to_xdp_buff(struct veth_rq *rq,xdp_prepare_buff (xdp, skb->head,skb_headroom (skb),skb_headlen (skb), true); -if (skb_is_nonlinear (skb)) { +if (skb_shinfo (skb)->nr_frags) {skb_shinfo (skb)->xdp_frags_size = skb->data_len;xdp_buff_set_frags_flag (xdp); }else {net/core/skbuff.c +12
-6@@ -927,6 +927,18 @@ static void skb_clone_fraglist(struct sk_buff *skb)skb_get (list); } +/** +* skb_pp_cow_data() - copy skb data into page-pool backed storage +* @pool: page pool to allocate from +* @pskb: pointer to skb pointer, replaced with the copied skb on success +* @headroom: headroom to reserve in the copied skb +* +* skb_copy_bits() handles both frags[] and frag_list input. If the copied +* skb remains non-linear, it uses frags[], which is the representation used +* by XDP multi-buffer. +* +* Return: 0 on success or a negative errno on failure. +*/ int skb_pp_cow_data (struct page_pool *pool,struct sk_buff **pskb,unsigned int headroom) {@@ -936,12 +948,6 @@ int skb_pp_cow_data(struct page_pool *pool, struct sk_buff **pskb,int err, i, head_off;void *data; -/* XDP does not support fraglist so we need to linearize -* the skb. -*/ -if (skb_has_frag_list (skb)) -return -EOPNOTSUPP ; - max_head_size =SKB_WITH_OVERHEAD (PAGE_SIZE - headroom);if (skb->len > max_head_size +MAX_SKB_FRAGS *PAGE_SIZE )return -ENOMEM ;Signature · 1 line
2.43.0
[email protected]
AI reviewThank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Pre-existing issues:
- [Critical] skb_pp_cow_data fails to account for skb_shared_info overhead in truesize, leading to memory corruption and skb_over_panic. --
--- Patch [1]: [PATCH net v3] veth: convert frag_list skbs before running XDP --- commit 2a77993dec578b7da44e393d4e9fecc7e0e8c05c
Author: Matt Fleming <[email protected]>
veth: convert frag_list skbs before running XDP
This commit fixes an AF_XDP copy mode crash by routing nonlinear skbs through skb_pp_cow_data() before exposing them to XDP, preventing empty frags[] from being exposed.
drivers/net/veth.c static int veth_convert_skb_to_xdp_buff(struct veth_rq *rq, · line 762
Quoted 13 lines
drivers/net/veth.c +1
-1@@ -756,7 +756,7 @@ static int veth_convert_skb_to_xdp_buff(struct veth_rq *rq,u32 frame_sz;if (skb_shared (skb) ||skb_head_is_locked (skb) || -skb_shinfo (skb)->nr_frags || +skb_is_nonlinear (skb) ||skb_headroom (skb) <XDP_PACKET_HEADROOM ) {if (skb_pp_cow_data (rq->page_pool, pskb,XDP_PACKET_HEADROOM )) goto drop;
[Severity: Critical]
This isn't a bug introduced by this patch, but does changing this condition route more traffic into a memory corruption issue inside skb_pp_cow_data()?
Looking at skb_pp_cow_data() in net/core/skbuff.c, it computes the allocation size without accounting for the skb_shared_info structural overhead:
truesize = SKB_HEAD_ALIGN(size) + headroom;
data = page_pool_dev_alloc_va(pool, &truesize);When page_pool_dev_alloc_va() allocates from a page fragment (which happens when the requested size is <= PAGE_SIZE / 2), it returns a buffer of exactly the requested size.
The subsequent call to napi_build_skb() unconditionally subtracts the skb_shared_info overhead from this size, setting skb->end below the required bounds. This causes the payload copy in skb_copy_bits() to overwrite the shared info, and later skb_put() calls will crash with an skb_over_panic.
Since standard 1500-byte MTU packets satisfy this fragment threshold (1792 <= 2048), will routing all nonlinear SKBs into this path allow remote input to reliably trigger a kernel panic?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Wed, 22 Jul 2026 20:19:25 +0100 you wrote:
From: Matt Fleming <[email protected]>
A
frag_listskb can reach veth withdata_lenset butnr_fragszero.veth_convert_skb_to_xdp_buff()only converts skbs that are shared, locked, have frags[], or do not have enough headroom. It later usesskb_is_nonlinear()to decide whether to setXDP_FLAGS_HAS_FRAGSandxdp_frags_size.[...]
Here is the summary with links:
- [net,v3] veth: convert frag_list skbs before running XDP
https://git.kernel.org/netdev/net/c/d0d641596304
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html