Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ovpn: properly deconfigure UDP-tunnel

When deconfiguring a UDP-tunnel from a socket, we cannot
call setup_udp_tunnel_sock() with an empty config, because
this helper is expected to be invoked only during setup.

Get rid of the call to setup_udp_tunnel_sock() and just
revert what it did during socket initialization..

Note that the global udp_encap_needed_key and the GRO state
are left untouched: udp_destroy_socket() will eventually
take care of them.

Cc: Sabrina Dubroca <sd@queasysnail.net>
Cc: Oleksandr Natalenko <oleksandr@natalenko.name>
Fixes: ab66abbc769b ("ovpn: implement basic RX path (UDP)")
Reported-by: Paolo Abeni <pabeni@redhat.com>
Closes: https://lore.kernel.org/netdev/1a47ce02-fd42-4761-8697-f3f315011cc6@redhat.com
Signed-off-by: Antonio Quartulli <antonio@openvpn.net>

+11 -3
+11 -3
drivers/net/ovpn/udp.c
··· 442 442 */ 443 443 void ovpn_udp_socket_detach(struct ovpn_socket *ovpn_sock) 444 444 { 445 - struct udp_tunnel_sock_cfg cfg = { }; 445 + struct sock *sk = ovpn_sock->sock->sk; 446 446 447 - setup_udp_tunnel_sock(sock_net(ovpn_sock->sock->sk), ovpn_sock->sock, 448 - &cfg); 447 + /* Re-enable multicast loopback */ 448 + inet_set_bit(MC_LOOP, sk); 449 + /* Disable CHECKSUM_UNNECESSARY to CHECKSUM_COMPLETE conversion */ 450 + inet_dec_convert_csum(sk); 451 + 452 + WRITE_ONCE(udp_sk(sk)->encap_type, 0); 453 + WRITE_ONCE(udp_sk(sk)->encap_rcv, NULL); 454 + WRITE_ONCE(udp_sk(sk)->encap_destroy, NULL); 455 + 456 + rcu_assign_sk_user_data(sk, NULL); 449 457 }