Skip to content

Commit aed728c

Browse files
Florian Westphalgregkh
authored andcommitted
ipv6: avoid write to a possibly cloned skb
[ Upstream commit 79e49503efe53a8c51d8b695bedc8a346c5e4a87 ] 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 5f8bc38 commit aed728c

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

net/ipv6/ip6_output.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -742,13 +742,14 @@ int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,
742742
* Fragment the datagram.
743743
*/
744744

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

748747
/*
749748
* Keep copying data until we run out.
750749
*/
751750
while (left > 0) {
751+
u8 *fragnexthdr_offset;
752+
752753
len = left;
753754
/* IF: it doesn't fit, use 'mtu' - the data space left */
754755
if (len > mtu)
@@ -793,6 +794,10 @@ int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,
793794
*/
794795
skb_copy_from_linear_data(skb, skb_network_header(frag), hlen);
795796

797+
fragnexthdr_offset = skb_network_header(frag);
798+
fragnexthdr_offset += prevhdr - skb_network_header(skb);
799+
*fragnexthdr_offset = NEXTHDR_FRAGMENT;
800+
796801
/*
797802
* Build fragment header.
798803
*/

0 commit comments

Comments
 (0)