Netdev List
 help / color / mirror / Atom feed
* [PATCH] ipv6: seg6: clear IPv4 control block in End.DT4
@ 2026-07-31 14:08 David Lee
  2026-07-31 15:24 ` Nicolas Dichtel
  0 siblings, 1 reply; 2+ messages in thread
From: David Lee @ 2026-07-31 14:08 UTC (permalink / raw)
  To: andrea.mayer, davem, edumazet, kuba, pabeni
  Cc: David Lee, Kyle Zeng, Dominik 'Disconnect3d' Czarnota,
	horms, netdev, linux-kernel

The End.DT4 input path decapsulates an IPv4 packet and sends it
directly to ip_route_input() and dst_input(). It therefore bypasses
ip_rcv_core(), which normally clears IPCB. The skb still contains
IP6CB data from the outer packet, and IPv6 extension-header offsets
overlap the IPv4 option fields. This can make __ip_options_echo()
copy beyond the allocation for saved options.

Clear IPCB after validating the inner IPv4 header and preserve the
ingress interface as ip_rcv_core() does. This prevents outer IPv6
metadata from being interpreted as inner IPv4 options.

Fixes: 664d6f86868b ("seg6: add support for the SRv6 End.DT4 behavior")
Bug found and triaged by OpenAI Security Research and 
validated by Trail of Bits.

Assisted-by: Codex:gpt-5.6-sol gpt-5.5-cyber
Signed-off-by: Kyle Zeng <kylebot@openai.com>
---
Trail of Bits has a reproducer for this bug that triggers a KASAN
slab-out-of-bounds write in __ip_options_echo() and can share if needed.

 net/ipv6/seg6_local.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/net/ipv6/seg6_local.c b/net/ipv6/seg6_local.c
index 2b41e4c0d..d03b377f5 100644
--- a/net/ipv6/seg6_local.c
+++ b/net/ipv6/seg6_local.c
@@ -1186,6 +1186,9 @@ static int input_action_end_dt4(struct sk_buff *skb,
 	if (!pskb_may_pull(skb, sizeof(struct iphdr)))
 		goto drop;
 
+	memset(IPCB(skb), 0, sizeof(*IPCB(skb)));
+	IPCB(skb)->iif = skb->skb_iif;
+
 	skb = end_dt_vrf_core(skb, slwt, AF_INET);
 	if (!skb)
 		/* packet has been processed and consumed by the VRF */

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

* Re: [PATCH] ipv6: seg6: clear IPv4 control block in End.DT4
  2026-07-31 14:08 [PATCH] ipv6: seg6: clear IPv4 control block in End.DT4 David Lee
@ 2026-07-31 15:24 ` Nicolas Dichtel
  0 siblings, 0 replies; 2+ messages in thread
From: Nicolas Dichtel @ 2026-07-31 15:24 UTC (permalink / raw)
  To: David Lee, andrea.mayer, davem, edumazet, kuba, pabeni
  Cc: Kyle Zeng, Dominik 'Disconnect3d' Czarnota, horms, netdev,
	linux-kernel

Le 31/07/2026 à 16:08, David Lee a écrit :
> The End.DT4 input path decapsulates an IPv4 packet and sends it
> directly to ip_route_input() and dst_input(). It therefore bypasses
> ip_rcv_core(), which normally clears IPCB. The skb still contains
> IP6CB data from the outer packet, and IPv6 extension-header offsets
> overlap the IPv4 option fields. This can make __ip_options_echo()
> copy beyond the allocation for saved options.
> 
> Clear IPCB after validating the inner IPv4 header and preserve the
> ingress interface as ip_rcv_core() does. This prevents outer IPv6
> metadata from being interpreted as inner IPv4 options.
> 
> Fixes: 664d6f86868b ("seg6: add support for the SRv6 End.DT4 behavior")
> Bug found and triaged by OpenAI Security Research and 
> validated by Trail of Bits.

There should be no empty line between tags.

> 
> Assisted-by: Codex:gpt-5.6-sol gpt-5.5-cyber
> Signed-off-by: Kyle Zeng <kylebot@openai.com>
> ---
> Trail of Bits has a reproducer for this bug that triggers a KASAN
> slab-out-of-bounds write in __ip_options_echo() and can share if needed.
> 
>  net/ipv6/seg6_local.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/net/ipv6/seg6_local.c b/net/ipv6/seg6_local.c
> index 2b41e4c0d..d03b377f5 100644
> --- a/net/ipv6/seg6_local.c
> +++ b/net/ipv6/seg6_local.c
> @@ -1186,6 +1186,9 @@ static int input_action_end_dt4(struct sk_buff *skb,
>  	if (!pskb_may_pull(skb, sizeof(struct iphdr)))
>  		goto drop;
>  
> +	memset(IPCB(skb), 0, sizeof(*IPCB(skb)));
> +	IPCB(skb)->iif = skb->skb_iif;
> +
>  	skb = end_dt_vrf_core(skb, slwt, AF_INET);
>  	if (!skb)
>  		/* packet has been processed and consumed by the VRF */
> 

End.DX4 also calls ip_route_input(). I guess the same problem exists. Am I wrong?

Regards,
Nicolas

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

end of thread, other threads:[~2026-07-31 15:24 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-07-31 14:08 [PATCH] ipv6: seg6: clear IPv4 control block in End.DT4 David Lee
2026-07-31 15:24 ` Nicolas Dichtel

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