Commit 79e49503 authored Mar 13, 2017 by Florian Westphal Committed by David S. Miller Mar 13, 2017

ipv6: avoid write to a possibly cloned skb



ip6_fragment, in case skb has a fraglist, checks if the
skb is cloned.  If it is, it will move to the 'slow path' and allocates
new skbs for each fragment.

However, right before entering the slowpath loop, it updates the
nexthdr value of the last ipv6 extension header to NEXTHDR_FRAGMENT,
to account for the fragment header that will be inserted in the new
ipv6-fragment skbs.

In case original skb is cloned this munges nexthdr value of another
skb.  Avoid this by doing the nexthdr update for each of the new fragment
skbs separately.

This was observed with tcpdump on a bridge device where netfilter ipv6
reassembly is active:  tcpdump shows malformed fragment headers as
the l4 header (icmpv6, tcp, etc). is decoded as a fragment header.

Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
Reported-by: Andreas Karis <akaris@redhat.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 6e526fdf

net/ipv6/ip6_output.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -768,13 +768,14 @@ slow_path:
		* Fragment the datagram.
		*/

		*prevhdr = NEXTHDR_FRAGMENT;
		troom = rt->dst.dev->needed_tailroom;

		/*
		* Keep copying data until we run out.
		*/
		while (left > 0) {
		u8 *fragnexthdr_offset;

		len = left;
		/* IF: it doesn't fit, use 'mtu' - the data space left */
		if (len > mtu)
		@@ -819,6 +820,10 @@ slow_path:
		*/
		skb_copy_from_linear_data(skb, skb_network_header(frag), hlen);

		fragnexthdr_offset = skb_network_header(frag);
		fragnexthdr_offset += prevhdr - skb_network_header(skb);
		*fragnexthdr_offset = NEXTHDR_FRAGMENT;

		/*
		* Build fragment header.
		*/

Admin message