diff options
author | Hannes Frederic Sowa <hannes@stressinduktion.org> | 2014-02-21 02:55:35 +0100 |
---|---|---|
committer | Zefan Li <lizefan@huawei.com> | 2014-12-01 18:02:44 +0800 |
commit | c58038a16f106bf0b63068eaabbdc088ca70449f (patch) | |
tree | 06a47affacebe831eed7f449a4825279ff3fad8a /net/ipv6 | |
parent | 4b7f15c26a453b1aa19965d515476700b8faaa0e (diff) |
ipv6: reuse ip6_frag_id from ip6_ufo_append_data
commit 916e4cf46d0204806c062c8c6c4d1f633852c5b6 upstream.
Currently we generate a new fragmentation id on UFO segmentation. It
is pretty hairy to identify the correct net namespace and dst there.
Especially tunnels use IFF_XMIT_DST_RELEASE and thus have no skb_dst
available at all.
This causes unreliable or very predictable ipv6 fragmentation id
generation while segmentation.
Luckily we already have pregenerated the ip6_frag_id in
ip6_ufo_append_data and can use it here.
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
[bwh: Backported to 3.2: adjust filename, indentation]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Zefan Li <lizefan@huawei.com>
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/udp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 98fd7384c446..ef9052f8c90b 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -1366,7 +1366,7 @@ static struct sk_buff *udp6_ufo_fragment(struct sk_buff *skb, fptr = (struct frag_hdr *)(skb_network_header(skb) + unfrag_ip6hlen); fptr->nexthdr = nexthdr; fptr->reserved = 0; - ipv6_select_ident(fptr, (struct rt6_info *)skb_dst(skb)); + fptr->identification = skb_shinfo(skb)->ip6_frag_id; /* Fragment the skb. ipv6 header and the remaining fields of the * fragment header are updated in ipv6_gso_segment() |