diff options
| author |   Xin Long <lucien.xin@gmail.com> | 2020-10-29 15:04:56 +0800 |
|---|---|---|
| committer |   Jakub Kicinski <kuba@kernel.org> | 2020-10-30 15:23:41 -0700 |
| commit | 3c7d4415db6a2fa9312e3b5a3e7ca08ed09c9f57 (patch) | |
| tree | a09fec9bce73637e18667031e361ecff39df6096 /net | |
| parent | udp: check udp sock encap_type in __udp_lib_err (diff) | |
| download | linux-dev-3c7d4415db6a2fa9312e3b5a3e7ca08ed09c9f57.tar.xz linux-dev-3c7d4415db6a2fa9312e3b5a3e7ca08ed09c9f57.zip | |
udp6: move the mss check after udp gso tunnel processing
For some protocol's gso, like SCTP, it's using GSO_BY_FRAGS for
gso_size. When using UDP to encapsulate its packet, it will
return error in udp6_ufo_fragment() as skb->len < gso_size,
and it will never go to the gso tunnel processing.
So we should move this check after udp gso tunnel processing,
the same as udp4_ufo_fragment() does.
v1->v2:
- no change.
v2->v3:
- not do any cleanup.
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/udp_offload.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv6/udp_offload.c b/net/ipv6/udp_offload.c index 584157a07759..aa602af8e49d 100644 --- a/net/ipv6/udp_offload.c +++ b/net/ipv6/udp_offload.c @@ -28,10 +28,6 @@ static struct sk_buff *udp6_ufo_fragment(struct sk_buff *skb, int tnl_hlen; int err; - mss = skb_shinfo(skb)->gso_size; - if (unlikely(skb->len <= mss)) - goto out; - if (skb->encapsulation && skb_shinfo(skb)->gso_type & (SKB_GSO_UDP_TUNNEL|SKB_GSO_UDP_TUNNEL_CSUM)) segs = skb_udp_tunnel_segment(skb, features, true); @@ -48,6 +44,10 @@ static struct sk_buff *udp6_ufo_fragment(struct sk_buff *skb, if (skb_shinfo(skb)->gso_type & SKB_GSO_UDP_L4) return __udp_gso_segment(skb, features); + mss = skb_shinfo(skb)->gso_size; + if (unlikely(skb->len <= mss)) + goto out; + /* Do software UFO. Complete and fill in the UDP checksum as HW cannot * do checksum of UDP packets sent as multiple IP fragments. */ |