Skip to content

Commit 5ae1e99

Browse files
Florian Westphalkuba-moo
authored andcommitted
net: ip_tunnel: prevent perpetual headroom growth
syzkaller triggered following kasan splat: BUG: KASAN: use-after-free in __skb_flow_dissect+0x19d1/0x7a50 net/core/flow_dissector.c:1170 Read of size 1 at addr ffff88812fb4000e by task syz-executor183/5191 [..] kasan_report+0xda/0x110 mm/kasan/report.c:588 __skb_flow_dissect+0x19d1/0x7a50 net/core/flow_dissector.c:1170 skb_flow_dissect_flow_keys include/linux/skbuff.h:1514 [inline] ___skb_get_hash net/core/flow_dissector.c:1791 [inline] __skb_get_hash+0xc7/0x540 net/core/flow_dissector.c:1856 skb_get_hash include/linux/skbuff.h:1556 [inline] ip_tunnel_xmit+0x1855/0x33c0 net/ipv4/ip_tunnel.c:748 ipip_tunnel_xmit+0x3cc/0x4e0 net/ipv4/ipip.c:308 __netdev_start_xmit include/linux/netdevice.h:4940 [inline] netdev_start_xmit include/linux/netdevice.h:4954 [inline] xmit_one net/core/dev.c:3548 [inline] dev_hard_start_xmit+0x13d/0x6d0 net/core/dev.c:3564 __dev_queue_xmit+0x7c1/0x3d60 net/core/dev.c:4349 dev_queue_xmit include/linux/netdevice.h:3134 [inline] neigh_connected_output+0x42c/0x5d0 net/core/neighbour.c:1592 ... ip_finish_output2+0x833/0x2550 net/ipv4/ip_output.c:235 ip_finish_output+0x31/0x310 net/ipv4/ip_output.c:323 .. iptunnel_xmit+0x5b4/0x9b0 net/ipv4/ip_tunnel_core.c:82 ip_tunnel_xmit+0x1dbc/0x33c0 net/ipv4/ip_tunnel.c:831 ipgre_xmit+0x4a1/0x980 net/ipv4/ip_gre.c:665 __netdev_start_xmit include/linux/netdevice.h:4940 [inline] netdev_start_xmit include/linux/netdevice.h:4954 [inline] xmit_one net/core/dev.c:3548 [inline] dev_hard_start_xmit+0x13d/0x6d0 net/core/dev.c:3564 ... The splat occurs because skb->data points past skb->head allocated area. This is because neigh layer does: __skb_pull(skb, skb_network_offset(skb)); ... but skb_network_offset() returns a negative offset and __skb_pull() arg is unsigned. IOW, we skb->data gets "adjusted" by a huge value. The negative value is returned because skb->head and skb->data distance is more than 64k and skb->network_header (u16) has wrapped around. The bug is in the ip_tunnel infrastructure, which can cause dev->needed_headroom to increment ad infinitum. The syzkaller reproducer consists of packets getting routed via a gre tunnel, and route of gre encapsulated packets pointing at another (ipip) tunnel. The ipip encapsulation finds gre0 as next output device. This results in the following pattern: 1). First packet is to be sent out via gre0. Route lookup found an output device, ipip0. 2). ip_tunnel_xmit for gre0 bumps gre0->needed_headroom based on the future output device, rt.dev->needed_headroom (ipip0). 3). ip output / start_xmit moves skb on to ipip0. which runs the same code path again (xmit recursion). 4). Routing step for the post-gre0-encap packet finds gre0 as output device to use for ipip0 encapsulated packet. tunl0->needed_headroom is then incremented based on the (already bumped) gre0 device headroom. This repeats for every future packet: gre0->needed_headroom gets inflated because previous packets' ipip0 step incremented rt->dev (gre0) headroom, and ipip0 incremented because gre0 needed_headroom was increased. For each subsequent packet, gre/ipip0->needed_headroom grows until post-expand-head reallocations result in a skb->head/data distance of more than 64k. Once that happens, skb->network_header (u16) wraps around when pskb_expand_head tries to make sure that skb_network_offset() is unchanged after the headroom expansion/reallocation. After this skb_network_offset(skb) returns a different (and negative) result post headroom expansion. The next trip to neigh layer (or anything else that would __skb_pull the network header) makes skb->data point to a memory location outside skb->head area. v2: Cap the needed_headroom update to an arbitarily chosen upperlimit to prevent perpetual increase instead of dropping the headroom increment completely. Reported-and-tested-by: [email protected] Closes: https://groups.google.com/g/syzkaller-bugs/c/fL9G6GtWskY/m/VKk_PR5FBAAJ Fixes: 243aad8 ("ip_gre: include route header_len in max_headroom calculation") Signed-off-by: Florian Westphal <[email protected]> Reviewed-by: Simon Horman <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 45532b2 commit 5ae1e99

File tree

1 file changed

+21
-7
lines changed

1 file changed

+21
-7
lines changed

net/ipv4/ip_tunnel.c

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -554,6 +554,20 @@ static int tnl_update_pmtu(struct net_device *dev, struct sk_buff *skb,
554554
return 0;
555555
}
556556

557+
static void ip_tunnel_adj_headroom(struct net_device *dev, unsigned int headroom)
558+
{
559+
/* we must cap headroom to some upperlimit, else pskb_expand_head
560+
* will overflow header offsets in skb_headers_offset_update().
561+
*/
562+
static const unsigned int max_allowed = 512;
563+
564+
if (headroom > max_allowed)
565+
headroom = max_allowed;
566+
567+
if (headroom > READ_ONCE(dev->needed_headroom))
568+
WRITE_ONCE(dev->needed_headroom, headroom);
569+
}
570+
557571
void ip_md_tunnel_xmit(struct sk_buff *skb, struct net_device *dev,
558572
u8 proto, int tunnel_hlen)
559573
{
@@ -632,13 +646,13 @@ void ip_md_tunnel_xmit(struct sk_buff *skb, struct net_device *dev,
632646
}
633647

634648
headroom += LL_RESERVED_SPACE(rt->dst.dev) + rt->dst.header_len;
635-
if (headroom > READ_ONCE(dev->needed_headroom))
636-
WRITE_ONCE(dev->needed_headroom, headroom);
637-
638-
if (skb_cow_head(skb, READ_ONCE(dev->needed_headroom))) {
649+
if (skb_cow_head(skb, headroom)) {
639650
ip_rt_put(rt);
640651
goto tx_dropped;
641652
}
653+
654+
ip_tunnel_adj_headroom(dev, headroom);
655+
642656
iptunnel_xmit(NULL, rt, skb, fl4.saddr, fl4.daddr, proto, tos, ttl,
643657
df, !net_eq(tunnel->net, dev_net(dev)));
644658
return;
@@ -818,16 +832,16 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev,
818832

819833
max_headroom = LL_RESERVED_SPACE(rt->dst.dev) + sizeof(struct iphdr)
820834
+ rt->dst.header_len + ip_encap_hlen(&tunnel->encap);
821-
if (max_headroom > READ_ONCE(dev->needed_headroom))
822-
WRITE_ONCE(dev->needed_headroom, max_headroom);
823835

824-
if (skb_cow_head(skb, READ_ONCE(dev->needed_headroom))) {
836+
if (skb_cow_head(skb, max_headroom)) {
825837
ip_rt_put(rt);
826838
DEV_STATS_INC(dev, tx_dropped);
827839
kfree_skb(skb);
828840
return;
829841
}
830842

843+
ip_tunnel_adj_headroom(dev, max_headroom);
844+
831845
iptunnel_xmit(NULL, rt, skb, fl4.saddr, fl4.daddr, protocol, tos, ttl,
832846
df, !net_eq(tunnel->net, dev_net(dev)));
833847
return;

0 commit comments

Comments
 (0)