From patchwork Wed Nov 18 07:00:37 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liuchong <979504756@qq.com> X-Patchwork-Id: 5734 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:6022:309f:b0:11b:d6c:f273 with SMTP id f31csp601387laa; Tue, 17 Nov 2026 23:01:15 -0800 (PST) X-Forwarded-Encrypted: i=2; AL+hErFtU8IsGdtlvIA/v6PmIdbqisBCNPQCB6/0ORufH1+YqvEVoOCCxfvmoz71cawD/7prpmofmyuTMIo=@openvpn.net X-Received: by 2002:a05:693c:88c5:10b0:383:bef:b6f6 with SMTP id 5a478bee46e88-3830befbb72mr562000eec.21.1794985275428; Tue, 17 Nov 2026 23:01:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794985275; cv=none; d=google.com; s=arc-20260327; b=JqrFvmimsXGLty85kCqk9pRap6qA/P0kH1e0ucOLCcAVfRLv4H7J8a5ewDNioRLbbc /v8rfRMuMjrNTOuHvnlWnSrpBhtlLKxGsgBL0Rw+RVvbbMzfQt2jRKrcn4/B8/HSjwhR ZtMT5YVlteVB0sUh5Rc6Zscsb8CCGahw+Jl51uozhqbXOmOLbPdDvexAcviue7aV0PC/ ndIMxCcv+put4ccsV0xXa8L0PAsu9dA84Ab1oYRC/5zwdcaYM5/HT0r23cBG5vo9kxJh cBpweFj0YDtFRskZXJI03B6EUyhIWZvEwhW74diGETwV3Q1qOBKZyo0YohkAFL1nwnlX 7Rhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=errors-to:content-transfer-encoding:cc:reply-to:from:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:date:to:message-id:dkim-signature :dkim-signature:dkim-signature:dkim-signature; bh=Z/2FQF38f9LuvBcQ+W6peVBNM94XKRE7nYYGT8a8VVI=; fh=JsPJumI5IqCa8v8qOTYWBc/yZAo+FA4sNWPjS2lUaJo=; b=LS3OekpxeChzIq3LC1MVwyBu+XRnNLCFpIFzE6JNtdyhvQwG/LJtNs6TWcxaeYQcIw LaElPo50NVJzJnR/UJlj+FnXRn+NwjRY35tanPhQLA7KBKOJWXB0Tmkh2iAoDROJJ063 7xoskcU9rofECGu1dH+9JYfKuNT9kR8MfwWQNvA2XJdV9h1GfexCyl+hOFoSPRUj8VHa it0HBNHdSeoj58mOl/RGmAKZHYgkq0zOdE3pGnmYBQLTmvGns9YGbL0A1uOtBwCSHUfd 7stgRgx4NyEVREtVrCHTipVqREM8n93tuL/pYhum3a/FwGyuTOt9FrXxCeX24nBBb3Sk NRSw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=Kdm5c6ZD; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=EjiIO9JT; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=Yf5cETbI; dkim=neutral (body hash did not verify) header.i=@qq.com header.s=s201512 header.b=IIsvTVCq; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=lists.sourceforge.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 5a478bee46e88-382a998d4d8si3269964eec.45.2026.11.17.23.01.12 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Nov 2026 23:01:15 -0800 (PST) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=Kdm5c6ZD; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=EjiIO9JT; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=Yf5cETbI; dkim=neutral (body hash did not verify) header.i=@qq.com header.s=s201512 header.b=IIsvTVCq; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=lists.sourceforge.net DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.sourceforge.net; s=beta; h=Content-Transfer-Encoding:Content-Type:Cc: Reply-To:From:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Subject:MIME-Version:Date:To:Message-ID:Sender: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Unsubscribe-Post:List-Owner; bh=Z/2FQF38f9LuvBcQ+W6peVBNM94XKRE7nYYGT8a8VVI=; b=Kdm5c6ZDIexR0OxWzmKFLhg6pS 9u51QPb85hn7bBGQTcCU4Zt4n3jIwhjDgvPz5/xYfY45giFmmQ6yvrC3mmTwrpMX5f2+k9c/W3Kxz M57dmZ9lWAU7NAtI9QqNGAg6vQ29QxkOecGPZXtXutHBqchcNRhRWdBNlenf4TF6CI0w=; Received: from [127.0.0.1] (helo=sfs-ml-3.v29.lw.sourceforge.com) by sfs-ml-3.v29.lw.sourceforge.com with esmtp (Exim 4.100.1) (envelope-from ) id 1xTZfH-000000006L6-31Mt; Wed, 18 Nov 2026 07:01:07 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-3.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.100.1) (envelope-from <979504756@qq.com>) id 1xTZfG-000000006KV-0Xp6 for openvpn-devel@lists.sourceforge.net; Wed, 18 Nov 2026 07:01:06 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Date:Subject :Cc:To:From:Message-ID:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Unsubscribe-Post:List-Subscribe:List-Post:List-Owner:List-Archive; bh=rlsdF6Ptjg0z/qlYu6hrmjq4WNFlUg9sAyH13gwD+TU=; b=EjiIO9JTq4hK9lHLR3VHn1IsBW XFNfdPWHtMpUjsiEFArAxbfxsFBEGcwftamNnKA3dX9nziubFaAq7YLO2fotBxc1S9FSdYOqSbaz5 9nhrEBrVtmRDxgC/UPYctBeLCgw+9FgmJO20leJ2o4/7jvBB9VgAqON+rJoUl87U/lzk=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Date:Subject:Cc:To:From:Message-ID :Sender:Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Unsubscribe-Post: List-Subscribe:List-Post:List-Owner:List-Archive; bh=rlsdF6Ptjg0z/qlYu6hrmjq4WNFlUg9sAyH13gwD+TU=; b=Yf5cETbIg898+yVS8/VTPokySq cO5NzZTforRmy/sB12+3nRWJNEddvfwkv0LP4UINbrl3xTaO+NnAoSdTAuyHEbg+/+s9UwQYCjKFf wYedwUEEVsgawhmonEylNYxh0fuIPXN4g8xti3hW7XzcGfgAtbTd76TFqMySOy1pXW1k=; Received: from xmbghk7.mail.qq.com ([43.163.128.50]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.100.1) id 1xTZew-000000004ho-0eWB for openvpn-devel@lists.sourceforge.net; Wed, 18 Nov 2026 07:00:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1794985239; bh=rlsdF6Ptjg0z/qlYu6hrmjq4WNFlUg9sAyH13gwD+TU=; h=From:To:Cc:Subject:Date; b=IIsvTVCqxjTHSbJmbzML/1tDxeaqjV11NwWuZg+UtNlpQhx4cVOFW8Z4T3GwAbIxS PaU3t/4xS+XUUMcHxmZdYqqc7JlNoSSz1/t3MO8kDVpGdrIy41rY//9BkKpcs+KJvO 0xvF1Yp6IShsgXht1LE/5j8iRwAwzvfv5WCbk/EQ= Received: from VM-0-17-ubuntu.. ([124.223.3.35]) by newxmesmtplogicsvrszc50-0.qq.com (NewEsmtp) with SMTP id 250B0CE; Wed, 18 Nov 2026 15:00:37 +0800 X-QQ-mid: xmsmtpt1794985237t3vrhmp5b Message-ID: X-QQ-XMAILINFO: MTEKjEyAppcsdQUTnbW9rFjB8r8B8CnLAwuPwZQ923MYTctGEOXDiMoEHO1Xnr Kn0lmjBlOeOJb/J0Jg2CbP7l6CgKVwDzla6E7xEGRDa1w2FI2XEggh1CCB7HERq478KyMZngE51T ySKR913EooRoc8LcJNTSYdhy9LttVW1xO/uVeqRjBc+CY75h3PNQqmd/RsoqR7jXnb+Zgj1jkkz4 ucAFhi+dkxD5g1XBjhGVqLGocHIcej6fjSbPKyAxYTdOUAXRQpLP3rqdDbsTz57top/bUPJCl6xU ewVkBkj6q/CNTcMccg2x4TdmkG/RrRhUHLAsz1wK6WXQT8TSzimZdxS3c7D+UUhuVX30myfowF99 odDqIpMMUTxNb3p4E2WUs4BGemN3FHwps+771NUi+ztMYE1z8ZPCYAU8VT6pw00lONXGwnSA21p6 VrmJzoC8rW2K1YkvsL0bjUbu1M+/GtSDw317SsidCjxvJEVvalU8+LFZr7YiZ8Uhu5/di6pX9yda SEBFONQ8rpYnkjWJHVApnP9dsbBmyZblZ/rfpPtE/3VDuXU/fPXFpETyeHUNqcFjdcXuyL8K5VXT SJ5UfORLermMEdiBLeeNkzlDZ3j3jfLRYJ9r9nA1RCMqD5axLANQjIMXG8Jm5h66CZf751SuMCVp S896LllrMMnwfnClSTeQALc5rFo8HoxizgvqMB8mUaQkDkYP1//vmxsg6cY16q2MD/AanMSdrqyF 3Vs2cRk33p4w0VWXhH0A8k93e4OpviRW+udJUmV1AjxuceCIyhe+ZfEJro4YyoXXLuLfbqq2eZg4 FGPSoZu46PyAaZcnChR30KB7kt0bIIRdOK7wcBilSVs+6fyBytUMW6sy8tQx73/oEjV6h/9PmRKa wEd4M5cL/4D+iPIY64KqIqGZpESOqpzvRrc7TFWUuHnaRLr4RBfF6+l4tjM6hs6LnP8vhglXA8EC eVznD0Cst5Ra1qdvYh50YghXOeDTSV9Vaalp7de9nz8CYy5NI9pVC9dhwDr3Uk2c5zNR5ovfPchN WzKdahr0as3BbaNDuOs6vDWidbOB38z5MRc0eNrHUtLS1tylMqpcz51+r7Opw88O6m+q5hvuq4Pa 97AFMS X-QQ-XMRINFO: Nq+8W0+stu50tPAe92KXseR0ZZmBTk3gLg== To: openvpn-devel@lists.sourceforge.net Date: Wed, 18 Nov 2026 15:00:37 +0800 X-OQ-MSGID: <20261118070037.3265825-1-979504756@qq.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "sfi-spamd-1.hosts.colo.sdot.me", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: 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 alrea [...] Content analysis details: (1.1 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.0 RCVD_IN_UCE2 RBL: IP Subnet Listed in UCEPROTECT Level 2 [124.223.3.35 listed in dnsbl-2.uceprotect.net] -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [979504756(at)qq.com] 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [979504756(at)qq.com] X-Headers-End: 1xTZew-000000004ho-0eWB Subject: [Openvpn-devel] [PATCH] ovpn-dco: hold peer ref in ovpn_tcp_read_sock under RCU X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: liuchong via Openvpn-devel From: liuchong <979504756@qq.com> Reply-To: liuchong <979504756@qq.com> Cc: antonio@openvpn.net Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: 1882178480460036639 X-GMAIL-MSGID: 1882178480460036639 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 <979504756@qq.com> Reviewed-by: Ralf Lici --- 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. + */ peer = sock->peer; + if (unlikely(!ovpn_peer_hold(peer))) { + rcu_read_unlock(); + /* Peer is already being destroyed; stop consuming the stream. */ + return 0; + } + rcu_read_unlock(); while (in_len > 0) { /* no skb allocated means that we have to read (or finish reading) the 2 bytes @@ -103,11 +114,10 @@ static int ovpn_tcp_read_sock(read_descriptor_t *desc, struct sk_buff *in_skb, * Queue skb for sending to userspace via recvmsg on the socket */ if (likely(ovpn_opcode_from_skb(peer->tcp.skb, 0) == OVPN_DATA_V2)) { - /* hold reference to peer as required by ovpn_recv(). + /* Extra reference required by ovpn_recv() / decrypt_work. * - * NOTE: in this context we should already be holding a - * reference to this peer, therefore ovpn_peer_hold() is - * not expected to fail + * NOTE: this cannot fail as this function already holds a + * reference to the peer. */ WARN_ON(!ovpn_peer_hold(peer)); status = ovpn_recv(peer->ovpn, peer, peer->tcp.skb); @@ -140,10 +150,12 @@ next_read: copied += chunk; } + ovpn_peer_put(peer); return copied; err: netdev_err(peer->ovpn->dev, "cannot process incoming TCP data: %d\n", desc->error); ovpn_peer_del(peer, OVPN_DEL_PEER_REASON_TRANSPORT_ERROR); + ovpn_peer_put(peer); return 0; }