From: Antonio Quartulli <antonio@openvpn.net>
To: Sabrina Dubroca <sd@queasysnail.net>,
Michael Bommarito <michael.bommarito@gmail.com>
Cc: Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH net] net: ovpn: refuse TCP socket layering with an active ULP
Date: Tue, 19 May 2026 16:37:22 +0200 [thread overview]
Message-ID: <a91b5359-68e7-49a6-8701-fa37f3e5ae21@openvpn.net> (raw)
In-Reply-To: <agx0ZRfgc7WhuJtI@krikkit>
On 19/05/2026 16:32, Sabrina Dubroca wrote:
> 2026-05-17, 11:56:45 -0400, Michael Bommarito wrote:
>> ovpn's TCP transport replaces sk_prot, sk_data_ready, sk_write_space
>> and sk_socket->ops by direct field writes when a peer is attached, and
>> restores them by direct field writes when the peer is detached. That
>> layering scheme is not compatible with a TCP ULP (e.g. kTLS) being
>> installed on the same socket: ULP setup also captures the current
>> sk_prot as its lower layer and replaces sk_prot with its own. The two
>> schemes are not aware of each other and can be combined in either
>> order on the same fd.
>
> It looks like we should make ovpn-tcp a ULP (without requesting
> userspace to do the setsockopt, since we messed that up a year ago. I
> thought I had suggested that at some point, but maybe not). That's
> what it is anyway, and layering ovpn on top of (or underneath) ktls or
> espintcp makes no sense. It would save us the messy restore hacks in
> this patch.
I agree. I was just thinking about a way to prevent this entirely
without having to make each module (somewhat) aware of each other.
>
> mptcp calls tcp_set_ulp() from the setup, maybe ovpn can also do
> that. detach() may be an issue.
Yeah, looking into using tcp_set_ulp() makes sense.
>
>
> [...]
>> @@ -583,6 +610,26 @@ static void ovpn_tcp_close(struct sock *sk, long timeout)
>> sock = rcu_dereference_sk_user_data(sk);
>> if (!sock || !sock->peer || !ovpn_peer_hold(sock->peer)) {
>> rcu_read_unlock();
>> + /* No (or no-longer-attached) ovpn state on this socket.
>> + * That happens when ovpn_tcp_socket_detach() already ran
>> + * and cleared sk_user_data, but the caller chain still
>> + * dispatches ->close() on ovpn_tcp_prot. The two cases
>> + * that exhibit this are:
>> + * - a TCP ULP layered on top of ovpn whose close hook
>> + * chains via the captured ctx->sk_proto (which is
>> + * &ovpn_tcp_prot) after detach has run;
>> + * - the close-vs-detach race window where sk_user_data
>> + * has been cleared but sk_prot has not yet been
>> + * restored.
>> + * In both cases the TCP layer still owes the peer a
>> + * graceful close, so chain to the base TCP close.
>> + */
>
> This is a whole commit message, not a code comment.
I am also not sure what would happen if ovpn goes away first and then
kTLS is left with the ovpn CBs saved in its captured sk_proto.
Anyway, if we can prevent this from happening at all, as per Sabrina's
comment above, we would make our life much simpler.
Regards,
--
Antonio Quartulli
OpenVPN Inc.
next prev parent reply other threads:[~2026-05-19 14:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-17 15:56 Michael Bommarito
2026-05-19 14:32 ` Sabrina Dubroca
2026-05-19 14:37 ` Antonio Quartulli [this message]
2026-05-19 15:02 ` Michael Bommarito
2026-05-20 7:22 ` Antonio Quartulli
2026-05-20 9:16 ` Sabrina Dubroca
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a91b5359-68e7-49a6-8701-fa37f3e5ae21@openvpn.net \
--to=antonio@openvpn.net \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michael.bommarito@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sd@queasysnail.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®