Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ipv6: ip6_fragment: fix headroom tests and skb leak

David Woodhouse reports skb_under_panic when we try to push ethernet
header to fragmented ipv6 skbs:

skbuff: skb_under_panic: text:c1277f1e len:1294 put:14 head:dec98000
data:dec97ffc tail:0xdec9850a end:0xdec98f40 dev:br-lan
[..]
ip6_finish_output2+0x196/0x4da

David further debugged this:
[..] offending fragments were arriving here with skb_headroom(skb)==10.
Which is reasonable, being the Solos ADSL card's header of 8 bytes
followed by 2 bytes of PPP frame type.

The problem is that if netfilter ipv6 defragmentation is used, skb_cow()
in ip6_forward will only see reassembled skb.

Therefore, headroom is overestimated by 8 bytes (we pulled fragment
header) and we don't check the skbs in the frag_list either.

We can't do these checks in netfilter defrag since outdev isn't known yet.

Furthermore, existing tests in ip6_fragment did not consider the fragment
or ipv6 header size when checking headroom of the fraglist skbs.

While at it, also fix a skb leak on memory allocation -- ip6_fragment
must consume the skb.

I tested this e1000 driver hacked to not allocate additional headroom
(we end up in slowpath, since LL_RESERVED_SPACE is 16).

If 2 bytes of headroom are allocated, fastpath is taken (14 byte
ethernet header was pulled, so 16 byte headroom available in all
fragments).

Reported-by: David Woodhouse <dwmw2@infradead.org>
Diagnosed-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Florian Westphal <fw@strlen.de>
Tested-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Florian Westphal and committed by
David S. Miller
1d325d21 ce816eb0

+8 -6
+8 -6
net/ipv6/ip6_output.c
··· 586 586 frag_id = ipv6_select_ident(net, &ipv6_hdr(skb)->daddr, 587 587 &ipv6_hdr(skb)->saddr); 588 588 589 + hroom = LL_RESERVED_SPACE(rt->dst.dev); 589 590 if (skb_has_frag_list(skb)) { 590 591 int first_len = skb_pagelen(skb); 591 592 struct sk_buff *frag2; 592 593 593 594 if (first_len - hlen > mtu || 594 595 ((first_len - hlen) & 7) || 595 - skb_cloned(skb)) 596 + skb_cloned(skb) || 597 + skb_headroom(skb) < (hroom + sizeof(struct frag_hdr))) 596 598 goto slow_path; 597 599 598 600 skb_walk_frags(skb, frag) { 599 601 /* Correct geometry. */ 600 602 if (frag->len > mtu || 601 603 ((frag->len & 7) && frag->next) || 602 - skb_headroom(frag) < hlen) 604 + skb_headroom(frag) < (hlen + hroom + sizeof(struct frag_hdr))) 603 605 goto slow_path_clean; 604 606 605 607 /* Partially cloned skb? */ ··· 618 616 619 617 err = 0; 620 618 offset = 0; 621 - frag = skb_shinfo(skb)->frag_list; 622 - skb_frag_list_init(skb); 623 619 /* BUILD HEADER */ 624 620 625 621 *prevhdr = NEXTHDR_FRAGMENT; ··· 625 625 if (!tmp_hdr) { 626 626 IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)), 627 627 IPSTATS_MIB_FRAGFAILS); 628 - return -ENOMEM; 628 + err = -ENOMEM; 629 + goto fail; 629 630 } 631 + frag = skb_shinfo(skb)->frag_list; 632 + skb_frag_list_init(skb); 630 633 631 634 __skb_pull(skb, hlen); 632 635 fh = (struct frag_hdr *)__skb_push(skb, sizeof(struct frag_hdr)); ··· 726 723 */ 727 724 728 725 *prevhdr = NEXTHDR_FRAGMENT; 729 - hroom = LL_RESERVED_SPACE(rt->dst.dev); 730 726 troom = rt->dst.dev->needed_tailroom; 731 727 732 728 /*