ip6_tunnel: set inner ipproto before ip6_tnl_encap
authorAlexander Ovechkin <ovov@yandex-team.ru>
Thu, 29 Oct 2020 17:10:12 +0000 (20:10 +0300)
committerJakub Kicinski <kuba@kernel.org>
Fri, 30 Oct 2020 15:07:30 +0000 (08:07 -0700)
commit9e7c5b396e98eed859d3dd1ab235912a296faab5
treee845c782674b4778e1d5dd9b1027fce1d999f69d
parent07e0887302450a62f51dba72df6afb5fabb23d1c
ip6_tunnel: set inner ipproto before ip6_tnl_encap

ip6_tnl_encap assigns to proto transport protocol which
encapsulates inner packet, but we must pass to set_inner_ipproto
protocol of that inner packet.

Calling set_inner_ipproto after ip6_tnl_encap might break gso.
For example, in case of encapsulating ipv6 packet in fou6 packet, inner_ipproto
would be set to IPPROTO_UDP instead of IPPROTO_IPV6. This would lead to
incorrect calling sequence of gso functions:
ipv6_gso_segment -> udp6_ufo_fragment -> skb_udp_tunnel_segment -> udp6_ufo_fragment
instead of:
ipv6_gso_segment -> udp6_ufo_fragment -> skb_udp_tunnel_segment -> ip6ip6_gso_segment

Fixes: 6c11fbf97e69 ("ip6_tunnel: add MPLS transmit support")
Signed-off-by: Alexander Ovechkin <ovov@yandex-team.ru>
Link: https://lore.kernel.org/r/20201029171012.20904-1-ovov@yandex-team.ru
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/ipv6/ip6_tunnel.c