From patchwork Fri Jul 3 12:15:55 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ralf Lici X-Patchwork-Id: 5087 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:1887:b0:869:83bc:8c48 with SMTP id r7csp2034437max; Fri, 3 Jul 2026 05:16:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AFNElJ8XNKor0e4DDBPxQOl2XarrtDPvVYEqCAW+pfxL5iidEs/5W3Aniph5kq2QQule0dn0U/zw1eGy3c8=@openvpn.net X-Received: by 2002:a05:6820:1786:b0:6a1:fd87:5323 with SMTP id 006d021491bc7-6a309bb859fmr5652535eaf.52.1783081000411; Fri, 03 Jul 2026 05:16:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1783081000; cv=none; d=google.com; s=arc-20260327; b=I/PV0vQyxVccYp0uiePhlWXHI3xMBoURw3lXl4U9v9WJLo1Qw1XwMIpNoyltOnGqbC oLtq9M4hulj5Fv504Tg9cUA+JDAgRbk7deQ7x+lgLrC3UNxf4thpmXI2l4OSqQSwbLaD 9tZKPqJ7X3vKdTTkBYYfzQJ+UVHz16xqZttMRtd0NicvaAaUluTUuog2Ggpt9IoHv7ic /fxRPu1gfDQ+hoiE7zRKCao6+K5pugsHyDW7YjWbQ0MvskvY8xmWyGVf+QPQwZBUICXB w3iJPVvmhqkDV9uK2CgrfLtTUzEaSze+hn+1Rza2sszLNdOs/UyZSU0iOZGmmPvIHqf8 QEBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:dkim-signature :dkim-signature:dkim-signature; bh=N3mMJ1+O5S73tKXGVdV+PkxAAfykmToEagtmbETUzo0=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=kJjgNxdkPkJw3RDjQPchiP2GkLbFnW1qvs9RV//iTYyvQyrDRNsbHKvWuWtJMJniQy NCN3GwTxtN84OlWKjN3aFAjnH+46bkvP/dDBXDboj58T1CTpNHD5ecogmKRz1Kdo7HUe Vm6ygy3p97qtzvYrFkGmt+kfDAOR/8Rb1QLsrTa46FbBmpYaQJBvAFFvw6M3L3MM43A1 /h1KIagaKswZfE1bj044zeEYFBtSaWMn8Sb+ksvP67cHP4tX843SZeJTcj5EHaa44x/S n7vfKgKWuvylcjxvTjzz171doQzKTalDTPFoGE0tefNpWgMoyK/yFHqgtXGkdS3wZpvG hz/Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=M87RJNh5; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=ZYg+bpMQ; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=AKF+9WW6; dkim=neutral (body hash did not verify) header.i=@mandelbit.com header.s=MBO0001 header.b=lFeZ+fBF; 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 Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 586e51a60fabf-44cfbc029a1si1321304fac.288.2026.07.03.05.16.40 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Jul 2026 05:16:40 -0700 (PDT) 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=M87RJNh5; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=ZYg+bpMQ; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=AKF+9WW6; dkim=neutral (body hash did not verify) header.i=@mandelbit.com header.s=MBO0001 header.b=lFeZ+fBF; 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 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: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: Subject:MIME-Version:Message-ID:Date:To:From:Sender:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=N3mMJ1+O5S73tKXGVdV+PkxAAfykmToEagtmbETUzo0=; b=M87RJNh5tJU7vMGdQimfN2s7IP a9qsHMVKNYRrD+JQyh3tXBflRd7gxEe7d0PmhYMqvRlkC30TQ9j3LlL1qaph5mK5DaDSIn+66nn4b KG3KaoqRAvAv8KGkUFvgXfBs2ruhhKHwpqOSDoIqXbXXDPsy+FoV95NjiN3eThof30nk=; 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.95) (envelope-from ) id 1wfcon-0004Kn-I7; Fri, 03 Jul 2026 12:16:30 +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.95) (envelope-from ) id 1wfcok-0004Kg-Jb for openvpn-devel@lists.sourceforge.net; Fri, 03 Jul 2026 12:16:29 +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:Message-ID: Date:Subject:Cc:To:From: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-Subscribe:List-Post:List-Owner:List-Archive; bh=IFfM+ZVJqhdiX8l56EWH5BAALm2i8XRXRZszaDJCxeQ=; b=ZYg+bpMQXsZKAgs4lwlvc8SWVT nThGXFFLRjE5aBGqBqus+QywRhSutAbOkHiEzrkQGkphBewaSWqq7vFkznw1xUABZl6rxeJH3MXgU 8q4GeAR2TS5zVDWCKzMmqeiVGCt7n3fRg1wiu9kXCNQaRMlj/j80bbyprx9HmcUjvess=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-ID:Date:Subject:Cc:To:From :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-Subscribe:List-Post: List-Owner:List-Archive; bh=IFfM+ZVJqhdiX8l56EWH5BAALm2i8XRXRZszaDJCxeQ=; b=A KF+9WW6CDCZboPUXpo54MNGnPelw1kLZBcLIDtupVjrHuy0pH72tKEfSHL2i+0L6is/qEoqwglqey JFMVOy2kf/Ld6XkT1wcv05YS8Qh1auph7gDLqFT0oSk5ptMXFbFg0Mun1TQFqZcS6+69e4F2nqtXn mFmZWGOVVIQSW9II=; Received: from mout-b-105.mailbox.org ([195.10.208.50]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1wfcoi-0006yV-OU for openvpn-devel@lists.sourceforge.net; Fri, 03 Jul 2026 12:16:27 +0000 Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:b231:465::202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-b-105.mailbox.org (Postfix) with ESMTPS id 4gsCQg3TFfz9xm0; Fri, 3 Jul 2026 14:16:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mandelbit.com; s=MBO0001; t=1783080971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=IFfM+ZVJqhdiX8l56EWH5BAALm2i8XRXRZszaDJCxeQ=; b=lFeZ+fBFaIMkqeDMlXBHLhNnegwnuHtzCqkwP7tk59PEkgXdZQDgOEZVFCDiGf/L0kajpc 3h8PlDa3hkjxeA492MSM3dhPdj7QT2gC6iexhWCbimMlY2BnHMcnFmnVT7I+NZrSJSzPYO +nQRqiLlDqhllUNI7HtKwrWJX05DUswnXPMR29NfgB+avqr5uVwcEs6MUFQWNYfLxJZkBJ L6xfVQsj7s9LYJ33IQjACFpOXdHuScvMJqtwf1er/55qGCBtifRf9rieNRmDtqZg52fF13 w6/lRdjsmXU25h/lm6az6gfgUSeowBD97xfkQ1LK4Ebc8C99JdoNo6NsBjEfDQ== Authentication-Results: outgoing_mbo_mout; dkim=none; spf=pass (outgoing_mbo_mout: domain of ralf@mandelbit.com designates 2001:67c:2050:b231:465::202 as permitted sender) smtp.mailfrom=ralf@mandelbit.com From: Ralf Lici To: openvpn-devel@lists.sourceforge.net Date: Fri, 3 Jul 2026 14:15:55 +0200 Message-ID: MIME-Version: 1.0 X-Rspamd-Queue-Id: 4gsCQg3TFfz9xm0 X-Spam-Score: -0.2 (/) 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: Crypto completion callbacks hold both key-slot and peer references. The peer reference pins the netdev, and dropping the last peer reference can let netdev unregistration and module removal make progr [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [195.10.208.50 listed in wl.mailspike.net] X-Headers-End: 1wfcoi-0006yV-OU Subject: [Openvpn-devel] [PATCH ovpn net v3 1/3] ovpn: finish crypto callback cleanup before peer release 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: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: 1869695943035066360 X-GMAIL-MSGID: 1869695943035066360 Crypto completion callbacks hold both key-slot and peer references. The peer reference pins the netdev, and dropping the last peer reference can let netdev unregistration and module removal make progress. Do not release that peer reference before the callback has finished its own cleanup. If ovpn_crypto_key_slot_put runs after ovpn_peer_put, it can schedule an RCU callback backed by module text after ovpn_cleanup rcu_barrier has already run. The TX error path also freed the remaining skb after ovpn_peer_put, leaving callback cleanup outside the peer/netdev lifetime window. Release the key slot and free any remaining skb first, then drop the peer reference as the last callback action. Fixes: 8534731dbf2d ("ovpn: implement packet processing") Signed-off-by: Ralf Lici --- Changes since v2 https://lore.kernel.org/openvpn-devel/567de7a9371ce72b0632158799dd11bb543cae08.1783068961.git.ralf@mandelbit.com/ - Also free the remaining TX skb before dropping the peer reference, so crypto callbacks do not continue cleanup after peer release. drivers/net/ovpn/io.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/ovpn/io.c b/drivers/net/ovpn/io.c index a6b777a9c2d9..e5f2775392d7 100644 --- a/drivers/net/ovpn/io.c +++ b/drivers/net/ovpn/io.c @@ -204,10 +204,10 @@ void ovpn_decrypt_post(void *data, int ret) ovpn_dev_dstats_rx_dropped(peer->ovpn->dev); kfree_skb(skb); drop_nocount: - if (likely(peer)) - ovpn_peer_put(peer); if (likely(ks)) ovpn_crypto_key_slot_put(ks); + if (likely(peer)) + ovpn_peer_put(peer); } /* RX path entry point: decrypt packet and forward it to the device */ @@ -302,11 +302,11 @@ void ovpn_encrypt_post(void *data, int ret) err: if (unlikely(skb)) ovpn_dev_dstats_tx_dropped(peer->ovpn->dev); - if (likely(peer)) - ovpn_peer_put(peer); + kfree_skb(skb); if (likely(ks)) ovpn_crypto_key_slot_put(ks); - kfree_skb(skb); + if (likely(peer)) + ovpn_peer_put(peer); } static bool ovpn_encrypt_one(struct ovpn_peer *peer, struct sk_buff *skb)