Hi, Thanks for the patch.
On Wed, 18 Nov 2026 15:00:37 +0800, liuchong via Openvpn-devel <[email protected]> wrote: > ovpn_tcp_read_sock() uses sock->peer without taking a reference. > ovpn_peer_del() can drop the last hash-table reference while the > TCP data_ready callback is still attached, so peer->refcount may > already be zero when ovpn_peer_hold() is later called for > ovpn_recv(). That leads to a WARN_ON and a refcount underflow when > the async path puts the peer. > > Take the peer reference under rcu_read_lock() before leaving the > RCU critical section, and drop it on all exit paths. If the peer > is already being destroyed, stop consuming the stream quietly. > > Fixes: 209247cf6d47 ("ovpn-dco: implement TCP transport support") > Signed-off-by: liuchong <[email protected]> I'm not sure this SoB tag is fully compliant with the Developer Certificate of Origin. If you can, please use your real name, as the DCO asks for a known identity. > --- > drivers/net/ovpn-dco/tcp.c | 24 ++++++++++++++++++------ > 1 file changed, 18 insertions(+), 6 deletions(-) > > diff --git a/drivers/net/ovpn-dco/tcp.c b/drivers/net/ovpn-dco/tcp.c > index fe095f9..d8f9afd 100644 > --- a/drivers/net/ovpn-dco/tcp.c > +++ b/drivers/net/ovpn-dco/tcp.c > @@ -35,15 +35,26 @@ static int ovpn_tcp_read_sock(read_descriptor_t *desc, > struct sk_buff *in_skb, > > rcu_read_lock(); > sock = rcu_dereference_sk_user_data(sk); > - rcu_read_unlock(); > - > if (unlikely(!sock || !sock->peer)) { > + rcu_read_unlock(); > pr_err("ovpn: read_sock triggered for socket with no > metadata\n"); > desc->error = -EINVAL; > return 0; > } > > + /* Take a reference while still under RCU: ovpn_peer_del() may drop the > + * last hash-table reference before socket callbacks are restored in > + * ovpn_peer_release(). Without this hold, a concurrent delete leaves > + * peer->refcount at 0 while this callback still runs, causing > + * ovpn_peer_hold() for ovpn_recv() to fail and a later put to > underflow. > + */ The new comment is quite long for what it says, and the commit message already carries the same explanation. Something like /* hold the peer while still under RCU, it may be getting deleted */ would be enough. Aside from these two minor nits, neither of which needs a respin on its own account, the code LGTM. Reviewed-by: Ralf Lici <[email protected]> Regards, -- Ralf Lici Mandelbit Srl _______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
