[PATCH net-next 0/3] pull request: ovpn 2025-05-21

[Antonio Quartulli <antonio@openvpn.net>]

Hello netdev-team,

Here is (most likely) the last pull request for net-next for this
round.

Patch 1 substitutes a call to setup_udp_tunnel_sock() along the
cleanup path with cleanup_udp_tunnel_sock(). The latter is introduced
in this patch as well.

Patch 2 fixes a critical race condition (leading to null-ptr-deref)
triggered by ovpn removing a peer, while userspace is concurrently
closing the transport socket.
An earlier revision of this patch was already discussed on the
netdev mailing list and this version is the final result.

Finally patch 3 is fixing the TCP test case in the ovpn kselftests,
accidentally broken by the introduction of the UDP IPv6 test case.

Please pull or let me know of any issue.

Thanks a lot!
Antonio,


The following changes since commit 9ab0ac0e532afd167b3bec39b2eb25c53486dcb5:

  octeontx2-pf: Add tracepoint for NIX_PARSE_S (2025-05-20 12:37:37 +0200)

are available in the Git repository at:

  https://github.com/OpenVPN/ovpn-net-next tags/ovpn-net-next-20250521

for you to fetch changes up to cb4cc0e4a5d0ddb655f72fb9626408f060c2c15c:

  selftest/net/ovpn: fix TCP socket creation (2025-05-21 01:35:07 +0200)

----------------------------------------------------------------
This bugfix batch includes the following changes:
* dropped call to setup_udp_tunnel_sock() during cleanup
** substituted by new cleanup_udp_tunnel_sock()
* fixed race condition between peer removal (by kernel
  space) and socket closing (by userspace)
* fixed TCP kselftests

----------------------------------------------------------------
Antonio Quartulli (3):
      ovpn: properly deconfigure UDP-tunnel
      ovpn: ensure sk is still valid during cleanup
      selftest/net/ovpn: fix TCP socket creation

 drivers/net/ovpn/io.c                       |  8 ++--
 drivers/net/ovpn/netlink.c                  | 25 ++++++-----
 drivers/net/ovpn/peer.c                     |  4 +-
 drivers/net/ovpn/socket.c                   | 68 ++++++++++++++++-------------
 drivers/net/ovpn/socket.h                   |  4 +-
 drivers/net/ovpn/tcp.c                      | 65 ++++++++++++++-------------
 drivers/net/ovpn/tcp.h                      |  3 +-
 drivers/net/ovpn/udp.c                      | 37 +++++-----------
 drivers/net/ovpn/udp.h                      |  4 +-
 include/net/udp.h                           |  1 +
 include/net/udp_tunnel.h                    |  1 +
 net/ipv4/udp_tunnel_core.c                  | 28 ++++++++++++
 net/ipv6/udp.c                              |  6 +++
 tools/testing/selftests/net/ovpn/ovpn-cli.c |  1 +
 14 files changed, 146 insertions(+), 109 deletions(-)