udp: call udp_encap_enable for v6 sockets when enabling encap
authorXin Long <lucien.xin@gmail.com>
Wed, 3 Feb 2021 08:54:22 +0000 (16:54 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 8 Apr 2022 12:39:54 +0000 (14:39 +0200)
commit210e7b43d4dad04ddc7782444bc5457089a85bce
treef8095ba857742a171b9cddcf86ac277fabd65d9f
parente1a58498ef91f5713b8a0c41a8e09d5a640d8b7f
udp: call udp_encap_enable for v6 sockets when enabling encap

commit a4a600dd301ccde6ea239804ec1f19364a39d643 upstream.

When enabling encap for a ipv6 socket without udp_encap_needed_key
increased, UDP GRO won't work for v4 mapped v6 address packets as
sk will be NULL in udp4_gro_receive().

This patch is to enable it by increasing udp_encap_needed_key for
v6 sockets in udp_tunnel_encap_enable(), and correspondingly
decrease udp_encap_needed_key in udpv6_destroy_sock().

v1->v2:
  - add udp_encap_disable() and export it.
v2->v3:
  - add the change for rxrpc and bareudp into one patch, as Alex
    suggested.
v3->v4:
  - move rxrpc part to another patch.

Acked-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Tested-by: Antonio Quartulli <antonio@openvpn.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/bareudp.c
include/net/udp.h
include/net/udp_tunnel.h
net/ipv4/udp.c
net/ipv6/udp.c