diff options
| author | Sabrina Dubroca <sd@queasysnail.net> | 2015-03-19 11:22:32 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2019-08-13 12:39:30 +0100 |
| commit | 66d7c265f2b1358c389b825fd017eb82ebbba229 (patch) | |
| tree | 996282c0fc760ac19cc541505fa61d0c44999516 | |
| parent | dbac56343705df2d24e3588a6ef421d386eda7be (diff) | |
| download | linux-stable-66d7c265f2b1358c389b825fd017eb82ebbba229.tar.gz linux-stable-66d7c265f2b1358c389b825fd017eb82ebbba229.tar.bz2 linux-stable-66d7c265f2b1358c389b825fd017eb82ebbba229.zip | |
ipv6: call ipv6_proxy_select_ident instead of ipv6_select_ident in udp6_ufo_fragment
commit 8e199dfd82ee097b522b00344af6448715d8ee0c upstream.
Matt Grant reported frequent crashes in ipv6_select_ident when
udp6_ufo_fragment is called from openvswitch on a skb that doesn't
have a dst_entry set.
ipv6_proxy_select_ident generates the frag_id without using the dst
associated with the skb. This approach was suggested by Vladislav
Yasevich.
Fixes: 0508c07f5e0c ("ipv6: Select fragment id during UFO segmentation if not set.")
Cc: Vladislav Yasevich <vyasevic@redhat.com>
Reported-by: Matt Grant <matt@mattgrant.net.nz>
Tested-by: Matt Grant <matt@mattgrant.net.nz>
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Acked-by: Vladislav Yasevich <vyasevic@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | net/ipv6/udp_offload.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/ipv6/udp_offload.c b/net/ipv6/udp_offload.c index 8f121a5dae28..18db8cf27923 100644 --- a/net/ipv6/udp_offload.c +++ b/net/ipv6/udp_offload.c @@ -124,11 +124,9 @@ 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; - if (skb_shinfo(skb)->ip6_frag_id) - fptr->identification = skb_shinfo(skb)->ip6_frag_id; - else - ipv6_select_ident(fptr, - (struct rt6_info *)skb_dst(skb)); + if (!skb_shinfo(skb)->ip6_frag_id) + ipv6_proxy_select_ident(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() |