Skip to contentSkip to conversation

ipv6: seg6: clear IPv4 control block in End.DT4

PATCH In review David Lee 3 participants 4 messages Aug 4 – Aug 9 1 message not in the archive

Subsystems (3)
lore
Share & tools
lore

David Lee

author
#0 lore raw

PATCH v2 1/1 ipv6: seg6: clear IPv4 control block in End.DT4

From: Kyle Zeng <[email protected]>

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")
Assisted-by Codex:gpt-5.6-sol Codex:gpt-5.5-cyber

---
Changes in v2:
- Restore Kyle Zeng as the patch author and correct the sign-off chain.

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

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(+)
net/ipv6/seg6_local.c +3 -0
index 2b41e4c0d..d03b377f5 100644
@@ -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 */
Signature · 1 line
2.53.0
#1 lore raw

Le 04/08/2026 à 11:46, David Lee a écrit :

Quoted 13 lines

From: Kyle Zeng <[email protected]>

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.

Quoted 8 lines
Fixes 664d6f86868b ("seg6: add support for the SRv6 End.DT4 behavior")
Assisted-by Codex:gpt-5.6-sol Codex:gpt-5.5-cyber

---
Changes in v2:
- Restore Kyle Zeng as the patch author and correct the sign-off chain.

You didn't answer my previous question:

Quoted 2 lines

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

A message that is not in the archive (sent off-list or not yet received): CAC_etQFJTsCN5zr_gxO_SEDjbJU4-yph0ezbvQ6zZ9ZVaLie0w@mail.gmail.com

#3 lore raw

Le 05/08/2026 à 12:17, David Lee a écrit :

Quoted 1 line

Hi Nicoals,

Hi,

please avoid top-posting ;-)
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst#n336

Quoted 7 lines

You were right. I tested End.DX4 separately on the 62cc90241548 (v7.2-rc5) kernel and it produced:

BUG: KASAN: slab-out-of-bounds in __ip_options_echo()
Write of size 255
Quoted 8 lines

The stack contains both input_action_end_dx4_finish() and input_action_end_dx4(). A matched bounded control traversed End.DX4, reached SYN_RECV, and produced no kernel diagnostic.

Therefore, End.DX4 has the same stale IP6CB-to-IPCB issue. The current patch only clears IPCB in End.DT4 and is incomplete.

Do you prefer v3 to be sent out to cover this case too?

Yes, it would be nice to fix both in the same time.

Regards,
Nicolas

maintainer
#4 lore raw

On Wed, 5 Aug 2026 13:58:21 +0200
Nicolas Dichtel <[email protected]> wrote:

Thanks Kyle and David for the patch, and Nicolas for catching the End.DX4 gap. Before v3, a few comments on the commit message and on the code.

Quoted 3 lines · David Lee
Quoted 2 lines
BUG: KASAN: slab-out-of-bounds in __ip_options_echo()
Write of size 255

Putting the KASAN trace in the commit message would show the impact concretely and tell a reviewer how the problem is reached.
Is the reproducer available somewhere? I'm wondering if it could easily be turned into a test, both to check that the fix works as expected and to help discover other related issues.

Quoted 5 lines
Quoted 4 lines

Therefore, End.DX4 has the same stale IP6CB-to-IPCB issue. The current patch only clears IPCB in End.DT4 and is incomplete.

Do you prefer v3 to be sent out to cover this case too?

Yes, it would be nice to fix both in the same time.

End.DX4 and End.DT4 both reach the inner IPv4 packet through decap_and_validate(skb, IPPROTO_IPIP). End.DT46 dispatches to End.DT4, so it is covered either way. Handling IPPROTO_IPIP inside decap_and_validate() covers End.DX4 too, so v3 would need a single memset there instead of one in input_action_end_dt4() and another in input_action_end_dx4(). Something like:

  if (proto == IPPROTO_IPIP) {
      int iif = IP6CB(skb)->iif;
      memset(IPCB(skb), 0, sizeof(*IPCB(skb)));
      IPCB(skb)->iif = iif;

}

On the interface index: I would take it from IP6CB->iif before the memset, rather than from skb->skb_iif. IP6CB->iif is what ip6_rcv_core() recorded for the outer packet: the interface that packet is considered to have arrived on. That value does not come from the headers that have just been removed, so removing them does not make it stale. skb->skb_iif is the right source in ip_rcv_core(), which runs before l3mdev, but End.DX4 and End.DT4 run after l3mdev.

When the packet is received on an interface enslaved to a VRF, ip6_rcv_core() puts that interface in IP6CB->iif and l3mdev then replaces skb->skb_iif with the L3 master. In decap_and_validate() IP6CB->iif still holds the receiving interface and skb->skb_iif holds the VRF.

I ran some tests on net/main and on two variants of the fix that differ only in what they write into IPCB->iif. The packet arrives on ifindex 8, enslaved to the VRF with ifindex 9, and the receiver is a UDP socket bound to the VRF reading IP_PKTINFO:

no fix iif from skb->skb_iif iif saved
End.DX4 8 9 8
End.DT4 8 9 8

The no fix column is net/main unchanged: seg6_local.c does not write IPCB->iif at all, so IP_PKTINFO reports what ip6_rcv_core() wrote in IP6CB->iif, read through IPCB because iif is at the same offset in inet_skb_parm and inet6_skb_parm.

So the two are not interchangeable: taking the index from skb->skb_iif makes IP_PKTINFO report the VRF instead of the receiving interface, taking it from IP6CB->iif before the memset does not.
IP_PKTINFO is not the only reader of IPCB->iif. With skb->skb_iif that field holds the VRF (ifindex 9), and after End.DT4 a socket listening on the receiving interface (ifindex 8) does not see the traffic.

It is also worth reconsidering the Fixes tag: decap_and_validate() has never cleared the control block, and its first IPPROTO_IPIP caller is End.DX4 in 891ef8dd2a8d ("ipv6: sr: implement additional seg6local actions"), which predates 664d6f86868b ("seg6: add support for the SRv6 End.DT4 behavior").

Two side notes, both of which the Sashiko automated review also raises. The same stale control block is left on the IPv6 side: with an outer Hop-by-Hop header IP6CB->nhoff points into the inner payload and I see those packets dropped as an unknown protocol. And input_action_end_dx4() and end_dt_vrf_core() set the transport header at sizeof(struct iphdr), so it points inside the options when the inner IPv4 packet carries them. I have a reproducer for each and will send the two patches separately.

Thanks,

Ciao,
Andrea