Skip to content

Commit 5796015

Browse files
vaverindavem330
authored andcommitted
ipv6: allocate enough headroom in ip6_finish_output2()
When TEE target mirrors traffic to another interface, sk_buff may not have enough headroom to be processed correctly. ip_finish_output2() detect this situation for ipv4 and allocates new skb with enogh headroom. However ipv6 lacks this logic in ip_finish_output2 and it leads to skb_under_panic: skbuff: skb_under_panic: text:ffffffffc0866ad4 len:96 put:24 head:ffff97be85e31800 data:ffff97be85e317f8 tail:0x58 end:0xc0 dev:gre0 ------------[ cut here ]------------ kernel BUG at net/core/skbuff.c:110! invalid opcode: 0000 [#1] SMP PTI CPU: 2 PID: 393 Comm: kworker/2:2 Tainted: G OE 5.13.0 #13 Hardware name: Virtuozzo KVM, BIOS 1.11.0-2.vz7.4 04/01/2014 Workqueue: ipv6_addrconf addrconf_dad_work RIP: 0010:skb_panic+0x48/0x4a Call Trace: skb_push.cold.111+0x10/0x10 ipgre_header+0x24/0xf0 [ip_gre] neigh_connected_output+0xae/0xf0 ip6_finish_output2+0x1a8/0x5a0 ip6_output+0x5c/0x110 nf_dup_ipv6+0x158/0x1000 [nf_dup_ipv6] tee_tg6+0x2e/0x40 [xt_TEE] ip6t_do_table+0x294/0x470 [ip6_tables] nf_hook_slow+0x44/0xc0 nf_hook.constprop.34+0x72/0xe0 ndisc_send_skb+0x20d/0x2e0 ndisc_send_ns+0xd1/0x210 addrconf_dad_work+0x3c8/0x540 process_one_work+0x1d1/0x370 worker_thread+0x30/0x390 kthread+0x116/0x130 ret_from_fork+0x22/0x30 Signed-off-by: Vasily Averin <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent a1739c3 commit 5796015

File tree

1 file changed

+28
-0
lines changed

1 file changed

+28
-0
lines changed

net/ipv6/ip6_output.c

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,38 @@ static int ip6_finish_output2(struct net *net, struct sock *sk, struct sk_buff *
6060
{
6161
struct dst_entry *dst = skb_dst(skb);
6262
struct net_device *dev = dst->dev;
63+
unsigned int hh_len = LL_RESERVED_SPACE(dev);
64+
int delta = hh_len - skb_headroom(skb);
6365
const struct in6_addr *nexthop;
6466
struct neighbour *neigh;
6567
int ret;
6668

69+
/* Be paranoid, rather than too clever. */
70+
if (unlikely(delta > 0) && dev->header_ops) {
71+
/* pskb_expand_head() might crash, if skb is shared */
72+
if (skb_shared(skb)) {
73+
struct sk_buff *nskb = skb_clone(skb, GFP_ATOMIC);
74+
75+
if (likely(nskb)) {
76+
if (skb->sk)
77+
skb_set_owner_w(skb, skb->sk);
78+
consume_skb(skb);
79+
} else {
80+
kfree_skb(skb);
81+
}
82+
skb = nskb;
83+
}
84+
if (skb &&
85+
pskb_expand_head(skb, SKB_DATA_ALIGN(delta), 0, GFP_ATOMIC)) {
86+
kfree_skb(skb);
87+
skb = NULL;
88+
}
89+
if (!skb) {
90+
IP6_INC_STATS(net, ip6_dst_idev(dst), IPSTATS_MIB_OUTDISCARDS);
91+
return -ENOMEM;
92+
}
93+
}
94+
6795
if (ipv6_addr_is_multicast(&ipv6_hdr(skb)->daddr)) {
6896
struct inet6_dev *idev = ip6_dst_idev(skb_dst(skb));
6997

0 commit comments

Comments
 (0)