Skip to content

ovpn: harden UDP TX against mutable socket state

Ralf Lici openvpn-devel 3 versions – New

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest4 patches 0 repliesNew
  2. v24 patches 0 repliesSuperseded
  3. v14 patches 4 repliesSuperseded

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/4ovpn: avoid sending UDP packets with source port 0drivers/net/ovpn/io.c drivers/net/ovpn/udp.c drivers/net/ovpn/udp.h+28 -130 replies
2/4ovpn: validate sockets before attaching peer transportsdrivers/net/ovpn/netlink.c drivers/net/ovpn/socket.c+22 -90 replies
3/4ovpn: reject UDP remotes incompatible with socket familydrivers/net/ovpn/netlink.c+94 -380 replies
4/4ovpn: recheck UDP socket family before transmitdrivers/net/ovpn/peer.c drivers/net/ovpn/peer.h drivers/net/ovpn/tcp.c +1 more+46 -250 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v3 yet.

Read the v3 thread

Cover letter [Openvpn-devel] [PATCH ovpn net v3 0/4] ovpn: harden UDP TX against mutable socket state

Hi,

This is a rebase of v2 so no functional changes are included in this v3.

v1 added setup-time validation for userspace-provided sockets and TX-time checks for socket state that can still change after the socket is attached to ovpn.

In v1, ovpn_udp_send_skb consumed the error internally, so ovpn_encrypt_post could still update link TX stats and last_sent for a packet that was dropped before transmit. v2 propagates those errors back to the common TX completion path, so TX-side checks are handled as local transmit failures, not as successful handoff to the UDP stack.

v2 also makes socket/remote address-family mismatches fatal for the peer. Those mismatches mean the peer can no longer transmit with the socket it was configured with, so keeping it around would just keep dropping packets. The peer deletion is deferred through a common transport-error work item, which is also reused by the TCP transport-error paths.

The source-port-zero case is kept as drop+warning for now. It is still a broken socket state for ovpn TX, but it is not treated as a peer-fatal address-family mismatch in this series.

Thanks,

Ralf Lici
Mandelbit Srl

---
Changes since v2 https://lore.kernel.org/openvpn-devel/[email protected]/
- Rebase on top of OpenVPN/ovpn-net-next/development-net.

Changes since v1 https://lore.kernel.org/openvpn-devel/[email protected]/T/
- Add ratelimited warnings for TX-side socket state failures.
- Propagate local UDP TX errors to ovpn_encrypt_post, so local drops do
not update link TX stats or last_sent.
- Delete peers with TRANSPORT_ERROR on UDP socket/remote address-family
mismatches.
- Add a common deferred transport-error deletion helper shared by TCP and
UDP.
- Clarify that netlink socket/remote validation is setup-time diagnostics;
the TX path remains the runtime gate for mutable socket state.
- Use a single READ_ONCE() snapshot of sk->sk_family in the netlink helper.
- Fix the IPV6_V6ONLY typo.

Ralf Lici (4):
ovpn: avoid sending UDP packets with source port 0
ovpn: validate sockets before attaching peer transports
ovpn: reject UDP remotes incompatible with socket family
ovpn: recheck UDP socket family before transmit

 drivers/net/ovpn/io.c      |   4 +-
 drivers/net/ovpn/netlink.c | 133 ++++++++++++++++++++++++++++---------
 drivers/net/ovpn/peer.c    |  19 ++++++
 drivers/net/ovpn/peer.h    |   5 +-
 drivers/net/ovpn/socket.c  |  16 +++--
 drivers/net/ovpn/tcp.c     |  23 +------
 drivers/net/ovpn/udp.c     |  57 ++++++++++++----
 drivers/net/ovpn/udp.h     |   4 +-
 8 files changed, 183 insertions(+), 78 deletions(-)

base-commit: a6b96b20e356138d932e2e44eebe15bf01506c15

Signature · 8 lines
2.54.0



_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel