[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20250522140613.877-1-antonio@openvpn.net>
Date: Thu, 22 May 2025 16:06:09 +0200
From: Antonio Quartulli <antonio@...nvpn.net>
To: netdev@...r.kernel.org
Cc: Sabrina Dubroca <sd@...asysnail.net>,
"David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>,
Antonio Quartulli <antonio@...nvpn.net>
Subject: [PATCH net-next 0/4] pull request: ovpn 2025-05-22
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, with attention to the CONFIG_IPV6=m case.
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.
Patch 3 is fixing the TCP test case in the ovpn kselftests,
accidentally broken by the introduction of the UDP IPv6 test case.
Patch 4 is adding a missing kselftest script which is already
referenced by the Makefile.
Please pull or let me know of any issue.
Thanks a lot!
Antonio,
Antonio Quartulli (4):
ovpn: properly deconfigure UDP-tunnel
ovpn: ensure sk is still valid during cleanup
selftest/net/ovpn: fix TCP socket creation
selftest/net/ovpn: fix missing file
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/ipv6_stubs.h | 1 +
include/net/udp.h | 1 +
include/net/udp_tunnel.h | 13 ++++
net/ipv4/udp_tunnel_core.c | 22 ++++++
net/ipv6/af_inet6.c | 1 +
net/ipv6/udp.c | 6 ++
tools/testing/selftests/net/ovpn/ovpn-cli.c | 1 +
.../selftests/net/ovpn/test-large-mtu.sh | 9 +++
17 files changed, 163 insertions(+), 109 deletions(-)
create mode 100755 tools/testing/selftests/net/ovpn/test-large-mtu.sh
--
2.49.0
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-20250522
for you to fetch changes up to 35c3e81b334ed76093d5318238e869b46e3a0e21:
selftest/net/ovpn: fix missing file (2025-05-22 15:59:08 +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)
* minor fixes for ovpn kselftests
----------------------------------------------------------------
Antonio Quartulli (4):
ovpn: properly deconfigure UDP-tunnel
ovpn: ensure sk is still valid during cleanup
selftest/net/ovpn: fix TCP socket creation
selftest/net/ovpn: fix missing file
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/ipv6_stubs.h | 1 +
include/net/udp.h | 1 +
include/net/udp_tunnel.h | 13 +++++
net/ipv4/udp_tunnel_core.c | 22 +++++++
net/ipv6/af_inet6.c | 1 +
net/ipv6/udp.c | 6 ++
tools/testing/selftests/net/ovpn/ovpn-cli.c | 1 +
tools/testing/selftests/net/ovpn/test-large-mtu.sh | 9 +++
17 files changed, 163 insertions(+), 109 deletions(-)
create mode 100755 tools/testing/selftests/net/ovpn/test-large-mtu.sh
Powered by blists - more mailing lists