BPF List
 help / color / mirror / Atom feed
* [PATCH net v4] xsk: set network header on skb at generic transmit
@ 2026-11-20  7:39 Jason Xing
  2026-11-20 19:29 ` James Sawyer
  2026-11-20 19:39 ` Maciej Fijalkowski
  0 siblings, 2 replies; 3+ messages in thread
From: Jason Xing @ 2026-11-20  7:39 UTC (permalink / raw)
  To: magnus.karlsson, maciej.fijalkowski, sdf, davem, edumazet, kuba,
	pabeni, horms, alobakin
  Cc: netdev, bpf, Jason Xing, stable, James Sawyer,
	syzbot+f16c1b285c9f63994eec

When constructing an skb in the XSK generic transmit path, neither
xsk_build_skb() nor xsk_build_skb_zerocopy() calls
skb_reset_network_header(). After __finalize_skb_around(), the
network_header offset defaults to 0 (pointing to skb->head). The
subsequent skb_reserve(skb, hr) moves skb->data forward by hr bytes,
but leaves network_header still at 0. This makes skb_network_offset()
return a negative value (-hr).

When such an skb reaches a tunnel driver like ipgre_xmit(), the call
chain pskb_inet_may_pull() -> pskb_network_may_pull_reason() computes:

    pskb_may_pull_reason(skb, skb_network_offset(skb) + nhlen)

The negative int from skb_network_offset() is implicitly promoted to
unsigned int, wrapping around to a huge value. This triggers the
DEBUG_NET_WARN_ON_ONCE(len > INT_MAX) in pskb_may_pull_reason().

Call trace from syzkaller:
  ipgre_xmit+0x958/0xcd0 net/ipv4/ip_gre.c:658
  __netdev_start_xmit include/linux/netdevice.h:5400
  netdev_start_xmit include/linux/netdevice.h:5409
  __dev_direct_xmit+0x4b6/0x730 net/core/dev.c:4942
  __xsk_generic_xmit net/xdp/xsk.c:1079
  xsk_generic_xmit+0x277a/0x40a0 net/xdp/xsk.c:1120

Reset the network header so skb_network_offset() is valid (0). For the
non-CHECKSUM_PARTIAL case, unlike AF_PACKET, AF_XDP does not need to
locate the real L2/L3 boundary: an AF_XDP frame is always a complete,
opaque blob from userspace. So resetting the network header is enough
to restore the invariant and avoid the crash.

Note this is not sufficient for CHECKSUM_PARTIAL skbs, where drivers
derive the L2/L3 split from the header offsets for checksum offload;
that will be handled separately after this patch.

Fixes: 3914d88f7608 ("xsk: Respect device's headroom and tailroom on generic xmit path")
Cc: stable@vger.kernel.org
Reported-by: James Sawyer <jamessawyer@outlook.com>
Reported-by: syzbot+f16c1b285c9f63994eec@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=f16c1b285c9f63994eec
Signed-off-by: Jason Xing <kerneljasonxing@gmail.com>
---
V4
Link: https://lore.kernel.org/all/20260902121028.74092-1-kerneljasonxing@gmail.com/
1. use the one-liner change to fix non csum case at a minimum. As for
   csum, since the blamed commit is different, I plan to cook a patch to
   fix that[1].
2. revise the commit message accordingly.
3. add James reported-by tag since he spotted this and sent this in
   private.
[1]: https://lore.kernel.org/all/CAL+tcoB8f7H1ptcEk1iVH065AcUNPEL2V1gKoJacwr3zndfPWA@mail.gmail.com/

V3
Link: https://lore.kernel.org/all/20260901083325.3445-1-kerneljasonxing@gmail.com/
1. remove the misleading description about af_packet

V2
Link: https://lore.kernel.org/all/20260826012052.51028-1-kerneljasonxing@gmail.com/
1. add more clarification about why we don't probe the header like packet at
the end of the commit message (Jakub)
---
 net/xdp/xsk.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
index f22f9a2cdbbe..52d538160e0a 100644
--- a/net/xdp/xsk.c
+++ b/net/xdp/xsk.c
@@ -948,6 +948,8 @@ static int xsk_skb_init_misc(struct sk_buff *skb, struct xdp_sock *xs,
 {
 	int err;
 
+	skb_reset_network_header(skb);
+
 	err = xsk_skb_destructor_set_addr(skb, addr);
 	if (unlikely(err))
 		return err;
-- 
2.43.7


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2026-11-20 19:39 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-20  7:39 [PATCH net v4] xsk: set network header on skb at generic transmit Jason Xing
2026-11-20 19:29 ` James Sawyer
2026-11-20 19:39 ` Maciej Fijalkowski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox