Skip to contentSkip to conversation

ipv6: rpl: reserve mac_len headroom when recompressed SRH grows

PATCH Applied Greg Kroah-Hartman 3 participants 4 messages Apr 21 – May 2

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 ipv6: rpl: reserve mac_len headroom when recompressed SRH grows

ipv6_rpl_srh_rcv() decompresses an RFC 6554 Source Routing Header, swaps the next segment into ipv6_hdr->daddr, recompresses, then pulls the old header and pushes the new one plus the IPv6 header back. The recompressed header can be larger than the received one when the swap reduces the common-prefix length the segments share with daddr (CmprI=0, CmprE>0, seg[0][0] != daddr[0] gives the maximum +8 bytes).

pskb_expand_head() was gated on segments_left == 0, so on earlier segments the push consumed unchecked headroom. Once skb_push() leaves fewer than skb->mac_len bytes in front of data, skb_mac_header_rebuild()'s call to:

	skb_set_mac_header(skb, -skb->mac_len);

will store (data - head) - mac_len into the u16 mac_header field, which wraps to ~65530, and the following memmove() writes mac_len bytes ~64KiB past skb->head.

A single AF_INET6/SOCK_RAW/IPV6_HDRINCL packet over lo with a two segment type-3 SRH (CmprI=0, CmprE=15) reaches headroom 8 after one pass; KASAN reports a 14-byte OOB write in ipv6_rthdr_rcv.

Fix this by expanding the head whenever the remaining room is less than the push size plus mac_len, and request that much extra so the rebuilt MAC header fits afterwards.

Fixes 8610c7c6e3bd ("net: ipv6: add support for rpl sr exthdr")
Cc "David S. Miller" <[email protected]>
Cc David Ahern <[email protected]>
Cc Eric Dumazet <[email protected]>
Cc Jakub Kicinski <[email protected]>
Cc Paolo Abeni <[email protected]>
Cc Simon Horman <[email protected]>
Cc stable <[email protected]>
Reported-by Anthropic
Assisted-by gkh_clanker_t1000

---
v3: - skb_postpull_rcsum() should not be changed, it's chdr NOT hdr, ugh

      Link to v2: https://lore.kernel.org/r/2026042158-sediment-elliptic-a954@gregkh

v2: - fixed up if statement to actually work properly, and test it
against a working poc (poc will be sent separately)
Reworded the changelog and the subject to make more sense Link to v1: https://lore.kernel.org/r/2026042024-cabbie-gills-9371@gregkh

 net/ipv6/exthdrs.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
net/ipv6/exthdrs.c +6 -3
index 95558fd6f447..03cbce842c1a 100644
@@ -491,6 +491,7 @@ static int ipv6_rpl_srh_rcv(struct sk_buff *skb)
 	struct net *net = dev_net(skb->dev);
 	struct inet6_dev *idev;
 	struct ipv6hdr *oldhdr;
+	unsigned int chdr_len;
 	unsigned char *buf;
 	int accept_rpl_seg;
 	int i, err;
@@ -592,8 +593,10 @@ static int ipv6_rpl_srh_rcv(struct sk_buff *skb)
 	skb_pull(skb, ((hdr->hdrlen + 1) << 3));
 	skb_postpull_rcsum(skb, oldhdr,
 			   sizeof(struct ipv6hdr) + ((hdr->hdrlen + 1) << 3));
-	if (unlikely(!hdr->segments_left)) {
-		if (pskb_expand_head(skb, sizeof(struct ipv6hdr) + ((chdr->hdrlen + 1) << 3), 0,
+	chdr_len = sizeof(struct ipv6hdr) + ((chdr->hdrlen + 1) << 3);
+	if (unlikely(!hdr->segments_left ||
+		     skb_headroom(skb) < chdr_len + skb->mac_len)) {
+		if (pskb_expand_head(skb, chdr_len + skb->mac_len, 0,
 				     GFP_ATOMIC)) {
 			__IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)), IPSTATS_MIB_OUTDISCARDS);
 			kfree_skb(skb);
@@ -603,7 +606,7 @@ static int ipv6_rpl_srh_rcv(struct sk_buff *skb)
 
 		oldhdr = ipv6_hdr(skb);
 	}
-	skb_push(skb, ((chdr->hdrlen + 1) << 3) + sizeof(struct ipv6hdr));
+	skb_push(skb, chdr_len);
 	skb_reset_network_header(skb);
 	skb_mac_header_rebuild(skb);
 	skb_set_transport_header(skb, sizeof(struct ipv6hdr));
Signature · 1 line
2.53.0
#1 lore raw
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 8 lines · On Tue, 21 Apr 2026 15:16:33 +0200 you wrote:

ipv6_rpl_srh_rcv() decompresses an RFC 6554 Source Routing Header, swaps the next segment into ipv6_hdr->daddr, recompresses, then pulls the old header and pushes the new one plus the IPv6 header back. The recompressed header can be larger than the received one when the swap reduces the common-prefix length the segments share with daddr (CmprI=0, CmprE>0, seg[0][0] != daddr[0] gives the maximum +8 bytes).

[...]

Here is the summary with links:
- [net,v3] ipv6: rpl: reserve mac_len headroom when recompressed SRH grows

    https://git.kernel.org/netdev/net/c/9e6bf146b559

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
#2 lore raw
In reply to Greg Kroah-Hartman
Quoted 85 lines · Greg Kroah-Hartman

ipv6_rpl_srh_rcv() decompresses an RFC 6554 Source Routing Header, swaps the next segment into ipv6_hdr->daddr, recompresses, then pulls the old header and pushes the new one plus the IPv6 header back. The recompressed header can be larger than the received one when the swap reduces the common-prefix length the segments share with daddr (CmprI=0, CmprE>0, seg[0][0] != daddr[0] gives the maximum +8 bytes).

pskb_expand_head() was gated on segments_left == 0, so on earlier segments the push consumed unchecked headroom. Once skb_push() leaves fewer than skb->mac_len bytes in front of data, skb_mac_header_rebuild()'s call to:

        skb_set_mac_header(skb, -skb->mac_len);

will store (data - head) - mac_len into the u16 mac_header field, which wraps to ~65530, and the following memmove() writes mac_len bytes ~64KiB past skb->head.

A single AF_INET6/SOCK_RAW/IPV6_HDRINCL packet over lo with a two segment type-3 SRH (CmprI=0, CmprE=15) reaches headroom 8 after one pass; KASAN reports a 14-byte OOB write in ipv6_rthdr_rcv.

Fix this by expanding the head whenever the remaining room is less than the push size plus mac_len, and request that much extra so the rebuilt MAC header fits afterwards.

Fixes 8610c7c6e3bd ("net: ipv6: add support for rpl sr exthdr")
Cc "David S. Miller" <[email protected]>
Cc David Ahern <[email protected]>
Cc Eric Dumazet <[email protected]>
Cc Jakub Kicinski <[email protected]>
Cc Paolo Abeni <[email protected]>
Cc Simon Horman <[email protected]>
Cc stable <[email protected]>
Reported-by Anthropic
Assisted-by gkh_clanker_t1000

---
v3: - skb_postpull_rcsum() should not be changed, it's chdr NOT hdr, ugh

      Link to v2: https://lore.kernel.org/r/2026042158-sediment-elliptic-a954@gregkh

v2: - fixed up if statement to actually work properly, and test it
against a working poc (poc will be sent separately)
Reworded the changelog and the subject to make more sense Link to v1: https://lore.kernel.org/r/2026042024-cabbie-gills-9371@gregkh

 net/ipv6/exthdrs.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
net/ipv6/exthdrs.c +6 -4
index 95558fd6f447..03cbce842c1a 100644
@@ -491,6 +491,7 @@ static int ipv6_rpl_srh_rcv(struct sk_buff *skb)
        struct net *net = dev_net(skb->dev);
        struct inet6_dev *idev;
        struct ipv6hdr *oldhdr;
+       unsigned int chdr_len;
        unsigned char *buf;
        int accept_rpl_seg;
        int i, err;
@@ -592,8 +593,10 @@ static int ipv6_rpl_srh_rcv(struct sk_buff *skb)
        skb_pull(skb, ((hdr->hdrlen + 1) << 3));
        skb_postpull_rcsum(skb, oldhdr,
                           sizeof(struct ipv6hdr) + ((hdr->hdrlen + 1) << 3));
-       if (unlikely(!hdr->segments_left)) {
-               if (pskb_expand_head(skb, sizeof(struct ipv6hdr) + ((chdr->hdrlen + 1) << 3), 0,
+       chdr_len = sizeof(struct ipv6hdr) + ((chdr->hdrlen + 1) << 3);
+       if (unlikely(!hdr->segments_left ||
+                    skb_headroom(skb) < chdr_len + skb->mac_len)) {
+               if (pskb_expand_head(skb, chdr_len + skb->mac_len, 0,
                                     GFP_ATOMIC)) {
                        __IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)), IPSTATS_MIB_OUTDISCARDS);
                        kfree_skb(skb);
@@ -603,7 +606,7 @@ static int ipv6_rpl_srh_rcv(struct sk_buff *skb)
 
                oldhdr = ipv6_hdr(skb);
        }
-       skb_push(skb, ((chdr->hdrlen + 1) << 3) + sizeof(struct ipv6hdr));
+       skb_push(skb, chdr_len);
        skb_reset_network_header(skb);
        skb_mac_header_rebuild(skb);
        skb_set_transport_header(skb, sizeof(struct ipv6hdr));
--
Quoted 2 lines

2.53.0

I am happy to see this bug is finally fixed.

However, it seems the Reported-by tag does not include our credit.

We first submitted the security report and patch to [email protected] on February 23, titled:

[SECURITY] IPv6/RPL: 14-byte controllable OOB write via SRH len overflow + skb_mac_header_rebuild() u16 wraparound

[PATCH] ipv6: rpl: rebuild MAC+metadata safely when rewriting SRH

We have aslo followed up and resent the patch several times, CCing all relevant maintainers.

Could our credit be added to the patch?

I noticed this patch has already been merged into the mainline. Maybe it's too late to amend this patch. Is there any other way to document our reporting credit in the official records? Maybe in the stable backport?

This one is pretty important to us and we would appreciate it if our reporting credit could be reflected.

#3 lore raw
Quoted 112 lines · Yuan Tan
Quoted 85 lines · Greg Kroah-Hartman

ipv6_rpl_srh_rcv() decompresses an RFC 6554 Source Routing Header, swaps the next segment into ipv6_hdr->daddr, recompresses, then pulls the old header and pushes the new one plus the IPv6 header back. The recompressed header can be larger than the received one when the swap reduces the common-prefix length the segments share with daddr (CmprI=0, CmprE>0, seg[0][0] != daddr[0] gives the maximum +8 bytes).

pskb_expand_head() was gated on segments_left == 0, so on earlier segments the push consumed unchecked headroom. Once skb_push() leaves fewer than skb->mac_len bytes in front of data, skb_mac_header_rebuild()'s call to:

        skb_set_mac_header(skb, -skb->mac_len);

will store (data - head) - mac_len into the u16 mac_header field, which wraps to ~65530, and the following memmove() writes mac_len bytes ~64KiB past skb->head.

A single AF_INET6/SOCK_RAW/IPV6_HDRINCL packet over lo with a two segment type-3 SRH (CmprI=0, CmprE=15) reaches headroom 8 after one pass; KASAN reports a 14-byte OOB write in ipv6_rthdr_rcv.

Fix this by expanding the head whenever the remaining room is less than the push size plus mac_len, and request that much extra so the rebuilt MAC header fits afterwards.

Fixes 8610c7c6e3bd ("net: ipv6: add support for rpl sr exthdr")
Cc "David S. Miller" <[email protected]>
Cc David Ahern <[email protected]>
Cc Eric Dumazet <[email protected]>
Cc Jakub Kicinski <[email protected]>
Cc Paolo Abeni <[email protected]>
Cc Simon Horman <[email protected]>
Cc stable <[email protected]>
Reported-by Anthropic
Assisted-by gkh_clanker_t1000

---
v3: - skb_postpull_rcsum() should not be changed, it's chdr NOT hdr, ugh

      Link to v2: https://lore.kernel.org/r/2026042158-sediment-elliptic-a954@gregkh

v2: - fixed up if statement to actually work properly, and test it
against a working poc (poc will be sent separately)
Reworded the changelog and the subject to make more sense Link to v1: https://lore.kernel.org/r/2026042024-cabbie-gills-9371@gregkh

 net/ipv6/exthdrs.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
net/ipv6/exthdrs.c +6 -4
index 95558fd6f447..03cbce842c1a 100644
@@ -491,6 +491,7 @@ static int ipv6_rpl_srh_rcv(struct sk_buff *skb)
        struct net *net = dev_net(skb->dev);
        struct inet6_dev *idev;
        struct ipv6hdr *oldhdr;
+       unsigned int chdr_len;
        unsigned char *buf;
        int accept_rpl_seg;
        int i, err;
@@ -592,8 +593,10 @@ static int ipv6_rpl_srh_rcv(struct sk_buff *skb)
        skb_pull(skb, ((hdr->hdrlen + 1) << 3));
        skb_postpull_rcsum(skb, oldhdr,
                           sizeof(struct ipv6hdr) + ((hdr->hdrlen + 1) << 3));
-       if (unlikely(!hdr->segments_left)) {
-               if (pskb_expand_head(skb, sizeof(struct ipv6hdr) + ((chdr->hdrlen + 1) << 3), 0,
+       chdr_len = sizeof(struct ipv6hdr) + ((chdr->hdrlen + 1) << 3);
+       if (unlikely(!hdr->segments_left ||
+                    skb_headroom(skb) < chdr_len + skb->mac_len)) {
+               if (pskb_expand_head(skb, chdr_len + skb->mac_len, 0,
                                     GFP_ATOMIC)) {
                        __IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)), IPSTATS_MIB_OUTDISCARDS);
                        kfree_skb(skb);
@@ -603,7 +606,7 @@ static int ipv6_rpl_srh_rcv(struct sk_buff *skb)
 
                oldhdr = ipv6_hdr(skb);
        }
-       skb_push(skb, ((chdr->hdrlen + 1) << 3) + sizeof(struct ipv6hdr));
+       skb_push(skb, chdr_len);
        skb_reset_network_header(skb);
        skb_mac_header_rebuild(skb);
        skb_set_transport_header(skb, sizeof(struct ipv6hdr));
--
Quoted 2 lines

2.53.0

I am happy to see this bug is finally fixed.

However, it seems the Reported-by tag does not include our credit.

We first submitted the security report and patch to [email protected] on February 23, titled:

[SECURITY] IPv6/RPL: 14-byte controllable OOB write via SRH len overflow + skb_mac_header_rebuild() u16 wraparound

[PATCH] ipv6: rpl: rebuild MAC+metadata safely when rewriting SRH

We have aslo followed up and resent the patch several times, CCing all relevant maintainers.

Could our credit be added to the patch?

Quoted 4 lines

I noticed this patch has already been merged into the mainline. Maybe it's too late to amend this patch. Is there any other way to document our reporting credit in the official records? Maybe in the stable backport?

Sorry, I made this patch based on a different report to me as is documented in this patch, and did not notice that it was the same thing as this one as I am drowning in reports.

This happens at times, and we can't rewrite public git history as that's impossible to do, sorry about that. You have a public confirmation here that yes, you did report this same issue, and yes, you did submit a patch to resolve this, but it ended up being different from the one that was accepted. Which again, happens all the time, it's just the nature of development with a huge body of contributors.

thanks,

greg k-h