diff options
| author | Hannes Frederic Sowa <hannes@stressinduktion.org> | 2014-02-21 02:55:35 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-11-05 20:27:47 +0000 |
| commit | 8db33010af3020af7f4904b2dfffc9841ffc42e4 (patch) | |
| tree | 146f57f1ecc5067ca1ec6b64b71b247feb49ba69 /net/ipv6 | |
| parent | 4c84431245882b69537e78fea5f1686c35ddd9f9 (diff) | |
| download | kernel_samsung_smdk4412-8db33010af3020af7f4904b2dfffc9841ffc42e4.zip kernel_samsung_smdk4412-8db33010af3020af7f4904b2dfffc9841ffc42e4.tar.gz kernel_samsung_smdk4412-8db33010af3020af7f4904b2dfffc9841ffc42e4.tar.bz2 | |
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>
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 f8bec1e..d131a95 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -1362,7 +1362,7 @@ static struct sk_buff *udp6_ufo_fragment(struct sk_buff *skb, u32 features) 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() |