Skip to content

Commit 433597f

Browse files
edumazetopsiff
authored andcommitted
ipv6: reject malicious packets in ipv6_gso_segment()
[ Upstream commit d45cf1e7d7180256e17c9ce88e32e8061a7887fe ] syzbot was able to craft a packet with very long IPv6 extension headers leading to an overflow of skb->transport_header. This 16bit field has a limited range. Add skb_reset_transport_header_careful() helper and use it from ipv6_gso_segment() WARNING: CPU: 0 PID: 5871 at ./include/linux/skbuff.h:3032 skb_reset_transport_header include/linux/skbuff.h:3032 [inline] WARNING: CPU: 0 PID: 5871 at ./include/linux/skbuff.h:3032 ipv6_gso_segment+0x15e2/0x21e0 net/ipv6/ip6_offload.c:151 Modules linked in: CPU: 0 UID: 0 PID: 5871 Comm: syz-executor211 Not tainted 6.16.0-rc6-syzkaller-g7abc678e3084 #0 PREEMPT(full) Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 07/12/2025 RIP: 0010:skb_reset_transport_header include/linux/skbuff.h:3032 [inline] RIP: 0010:ipv6_gso_segment+0x15e2/0x21e0 net/ipv6/ip6_offload.c:151 Call Trace: <TASK> skb_mac_gso_segment+0x31c/0x640 net/core/gso.c:53 nsh_gso_segment+0x54a/0xe10 net/nsh/nsh.c:110 skb_mac_gso_segment+0x31c/0x640 net/core/gso.c:53 __skb_gso_segment+0x342/0x510 net/core/gso.c:124 skb_gso_segment include/net/gso.h:83 [inline] validate_xmit_skb+0x857/0x11b0 net/core/dev.c:3950 validate_xmit_skb_list+0x84/0x120 net/core/dev.c:4000 sch_direct_xmit+0xd3/0x4b0 net/sched/sch_generic.c:329 __dev_xmit_skb net/core/dev.c:4102 [inline] __dev_queue_xmit+0x17b6/0x3a70 net/core/dev.c:4679 Fixes: d1da932 ("ipv6: Separate ipv6 offload support") Reported-by: [email protected] Closes: https://lore.kernel.org/netdev/[email protected]/T/#u Signed-off-by: Eric Dumazet <[email protected]> Reviewed-by: Dawid Osuchowski <[email protected]> Reviewed-by: Willem de Bruijn <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]> Signed-off-by: Sasha Levin <[email protected]> (cherry picked from commit ef05007b403dcc21e701cb1f30d4572ac0a9da20)
1 parent 84116f3 commit 433597f

File tree

2 files changed

+26
-1
lines changed

2 files changed

+26
-1
lines changed

include/linux/skbuff.h

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2886,6 +2886,29 @@ static inline void skb_reset_transport_header(struct sk_buff *skb)
28862886
skb->transport_header = skb->data - skb->head;
28872887
}
28882888

2889+
/**
2890+
* skb_reset_transport_header_careful - conditionally reset transport header
2891+
* @skb: buffer to alter
2892+
*
2893+
* Hardened version of skb_reset_transport_header().
2894+
*
2895+
* Returns: true if the operation was a success.
2896+
*/
2897+
static inline bool __must_check
2898+
skb_reset_transport_header_careful(struct sk_buff *skb)
2899+
{
2900+
long offset = skb->data - skb->head;
2901+
2902+
if (unlikely(offset != (typeof(skb->transport_header))offset))
2903+
return false;
2904+
2905+
if (unlikely(offset == (typeof(skb->transport_header))~0U))
2906+
return false;
2907+
2908+
skb->transport_header = offset;
2909+
return true;
2910+
}
2911+
28892912
static inline void skb_set_transport_header(struct sk_buff *skb,
28902913
const int offset)
28912914
{

net/ipv6/ip6_offload.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,9 @@ static struct sk_buff *ipv6_gso_segment(struct sk_buff *skb,
150150

151151
ops = rcu_dereference(inet6_offloads[proto]);
152152
if (likely(ops && ops->callbacks.gso_segment)) {
153-
skb_reset_transport_header(skb);
153+
if (!skb_reset_transport_header_careful(skb))
154+
goto out;
155+
154156
segs = ops->callbacks.gso_segment(skb, features);
155157
if (!segs)
156158
skb->network_header = skb_mac_header(skb) + nhoff - skb->head;

0 commit comments

Comments
 (0)