* [PATCH] net: prevent receive header offset overflow during decapsulation
@ 2026-11-18 14:32 Chris J Arges
2026-11-18 14:38 ` netdev-bot+sinfo
0 siblings, 1 reply; 2+ messages in thread
From: Chris J Arges @ 2026-11-18 14:32 UTC (permalink / raw)
To: David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Simon Horman, David Ahern, Ido Schimmel
Cc: June Slater, Dan Jones, Jesse Brandeburg, Josef Bacik,
Chris Mason, kernel-team, netdev, linux-kernel, stable,
Chris J Arges
Repeated decapsulation can leave skb->data far from skb->head while
the remaining packet data is still valid. Since the skb header positions
are 16-bit offsets, a later header update can truncate and make header
access use unrelated bytes and eventually crash.
Limit receive headroom to 32 KiB. This is well beyond the headroom of
normal packets while allowing the networking stack to pull enough
headers in a single pass without overflowing 16-bit header offsets.
Tunnel decapsulation re-enters __netif_receive_skb_core(), so its check
protects nested IPIP and GRE. FOU and GUE bypass receive core, so check
their IPv4 and IPv6 resubmission paths too. Together, these checks
prevent 16-bit header-offset truncation in cases of repeated
decapsulation.
Report these rejections with the SKB_RX_HEADROOM drop reason.
Fixes: 1a37e412a022 ("net: Use 16bits for *_headers fields of struct skbuff")
Cc: stable@kernel.org
Suggested-by: Eric Dumazet <edumazet@kernel.org>
Signed-off-by: Chris J Arges <carges@cloudflare.com>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
---
| 1 +
| 6 ++++++
| 4 ++++
| 6 ++++++
| 4 ++++
5 files changed, 21 insertions(+)
--git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 6787fcf6ac3e..adc61f5e3e85 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -268,6 +268,7 @@
SKB_WITH_OVERHEAD((PAGE_SIZE << (ORDER)) - (X))
#define SKB_MAX_HEAD(X) (SKB_MAX_ORDER((X), 0))
#define SKB_MAX_ALLOC (SKB_MAX_ORDER(0, 2))
+#define SKB_MAX_RX_HEADROOM (U16_MAX / 2)
/* return minimum truesize of one skb containing X bytes of data */
#define SKB_TRUESIZE(X) ((X) + \
--git a/include/net/dropreason-core.h b/include/net/dropreason-core.h
index fa2fe8990557..903d6a3a0ff1 100644
--- a/include/net/dropreason-core.h
+++ b/include/net/dropreason-core.h
@@ -128,6 +128,7 @@
FN(PSP_INPUT) \
FN(PSP_OUTPUT) \
FN(RECURSION_LIMIT) \
+ FN(SKB_RX_HEADROOM) \
FNe(MAX)
/**
@@ -612,6 +613,11 @@ enum skb_drop_reason {
* itself.
*/
SKB_DROP_REASON_RECURSION_LIMIT,
+ /**
+ * @SKB_DROP_REASON_SKB_RX_HEADROOM: accumulated receive headroom
+ * exceeds the header-offset budget.
+ */
+ SKB_DROP_REASON_SKB_RX_HEADROOM,
/**
* @SKB_DROP_REASON_MAX: the maximum of core drop reasons, which
* shouldn't be used as a real 'reason' - only for tracing code gen
--git a/net/core/dev.c b/net/core/dev.c
index 3c58db732761..6140fd9d11cd 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6223,6 +6223,10 @@ static int __netif_receive_skb_core(struct sk_buff **pskb, bool pfmemalloc,
trace_netif_receive_skb(skb);
orig_dev = skb->dev;
+ if (unlikely(skb_headroom(skb) > SKB_MAX_RX_HEADROOM)) {
+ drop_reason = SKB_DROP_REASON_SKB_RX_HEADROOM;
+ goto drop;
+ }
skb_reset_network_header(skb);
#if !defined(CONFIG_DEBUG_NET)
--git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
index 9860178752b8..c74886b1f445 100644
--- a/net/ipv4/ip_input.c
+++ b/net/ipv4/ip_input.c
@@ -207,6 +207,12 @@ void ip_protocol_deliver_rcu(struct net *net, struct sk_buff *skb, int protocol)
ret = INDIRECT_CALL_2(ipprot->handler, tcp_v4_rcv, udp_rcv,
skb);
if (ret < 0) {
+ if (unlikely(skb_headroom(skb) > SKB_MAX_RX_HEADROOM)) {
+ __IP_INC_STATS(net, IPSTATS_MIB_INDISCARDS);
+ kfree_skb_reason(skb,
+ SKB_DROP_REASON_SKB_RX_HEADROOM);
+ return;
+ }
protocol = -ret;
goto resubmit;
}
--git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c
index d332ec60f915..6dc1211eade6 100644
--- a/net/ipv6/ip6_input.c
+++ b/net/ipv6/ip6_input.c
@@ -479,6 +479,10 @@ void ip6_protocol_deliver_rcu(struct net *net, struct sk_buff *skb, int nexthdr,
ret = INDIRECT_CALL_2(ipprot->handler, tcp_v6_rcv, udpv6_rcv,
skb);
if (ret > 0) {
+ if (unlikely(skb_headroom(skb) > SKB_MAX_RX_HEADROOM)) {
+ SKB_DR_SET(reason, SKB_RX_HEADROOM);
+ goto discard;
+ }
if (ipprot->flags & INET6_PROTO_FINAL) {
/* Not an extension header, most likely UDP
* encapsulation. Use return value as nexthdr
---
base-commit: 2a324a58a084c5cfd7e5a2f55e0786bee170a4a5
change-id: 20261118-prevent_rx_header_offset_overflow-45e24a2686d2
Best regards,
--
Chris J Arges <carges@cloudflare.com>
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] net: prevent receive header offset overflow during decapsulation
2026-11-18 14:32 [PATCH] net: prevent receive header offset overflow during decapsulation Chris J Arges
@ 2026-11-18 14:38 ` netdev-bot+sinfo
0 siblings, 0 replies; 2+ messages in thread
From: netdev-bot+sinfo @ 2026-11-18 14:38 UTC (permalink / raw)
To: Chris J Arges
Cc: David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Simon Horman, David Ahern, Ido Schimmel, June Slater, Dan Jones,
Jesse Brandeburg, Josef Bacik, Chris Mason, kernel-team, netdev,
linux-kernel, stable
Hi!
This is an automated message. This series looks like a fix, but its
commit messages seem to be missing some information:
- How the issue was discovered, e.g. hit in production, hit during
development, syzbot report, manual code inspection, LLM or static
analysis tool scan.
- Whether the issue was actually triggered, or is only theoretical
(e.g. found by LLM and not proven at runtime). If it was triggered
please include the symptoms, like the stack trace or kernel messages.
Please do not repost the series just to address the above. Instead,
reply to this email with the missing information, so that reviewers
can take it into account.
*IMPORTANT*: If you do repost (for other reasons) - please include
the relevant info in the cover letter or commit messages.
--
The evaluation is done by an LLM so it may be wrong, if you think
that is the case please reply and explain.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-11-18 14:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-18 14:32 [PATCH] net: prevent receive header offset overflow during decapsulation Chris J Arges
2026-11-18 14:38 ` netdev-bot+sinfo
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®