From nobody Mon Jul 6 17:15:21 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gv9wT3CYxz6kNbM for ; Mon, 06 Jul 2026 17:15:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gv9wT2Smvz3TKj for ; Mon, 06 Jul 2026 17:15:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783358121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u4p34wO7x4fiPeLGaAExOVJXbX9q+BdWg8etkLG83gE=; b=dffrBr8ijPS6z4UGQ1yU0t266dbAeInP7iZjNR127/LadNtJdkUAJTXh+Q3riXRdQdqvMp ROQgL4/BvdubEBgdSZmeUjnQQugiBrZS8hYDyFb4CPd9G/nkbpYXOqle1ZoDtkHE8KTTwC KHNwxHWnZgiCnM44EwidoB482rnTpXj9jRUBBT0y+OfVKLsi6u0Iuh1tpbRHlsU+a0H/Hq MC93ycDs1iQwmr5f/9FEvyrQZrPjkgjF9FVzoYvfhc+eY8fMWlDRNZjXUL0h2FtnURUfDr EVxeBs65SC9HC3/sl6SE8DSznw2q/VYZU8ZE/uwokX5LRS/DvOxF1dUKquzR1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783358121; a=rsa-sha256; cv=none; b=xT4LhqLaqDeUSecwCzB+h7/dOxouutohjZj01gohIwoZa2LEfzLoyJabrEuYp0BIjR7uis ER67GkTjgRMCGT6gymNMVdeBnDVvmfThNtEtsphecfbGOTANoaphebRj3qRKgnKKLD1YSU kHDoMKSJzA/l1clVVeSV/T3NzCNEVNlEAKvmR1khtig7HAWXJHMt8kcAVA8R0NDWIlk/wq SDxBaX6Rg+QdWoUJrX/132i1XSEMxeMjefRjt4oHFKrpC4fpJz5/OG5ArFQkYf0UVN36dU eMswTaim/XxlWj9KyvOnTFOTYC8t1b6UmXHc49Jbz28gSyTPPOK8/cl/lN8QAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783358121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u4p34wO7x4fiPeLGaAExOVJXbX9q+BdWg8etkLG83gE=; b=PwnXiGPz06PI6xje6Fluftw4BzlQ5TlRs6Pv/hZ+22b4mZRb/1gGRKDRSBs/SfxgRt7LQ0 cJELX07WOWk1GsVNUx2N3dc8ytT9C5LuvW0BJylofr34S59FApjUkrFrbpPxRl+4zKDkuC y5E8srrslWuKDN0fWsYtc6U6RqcDpz7X/uYP5arNvtc4FksNq5oxElzvdNVLU3L8SZe1ZS QNAtrNrx8/6toHeP1oSxVB8cH7NUzdOVsVycDK1ar6rO7zhzEFBCR4hKlYu6jpqLwUvgnB 59f2zgHBTHz9/z5AcWvFshpUD10q/XHTdFLsBDvgU/Yk6NHqOoZpJ02Hzemuxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gv9wT1QTRz1CmP for ; Mon, 06 Jul 2026 17:15:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31a29 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Jul 2026 17:15:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: bf142ea4760b - main - if_ovpn: Fix memory leak in VNET during unload List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bf142ea4760bd4391092d9cc0038a0870cf7e0b2 Auto-Submitted: auto-generated Date: Mon, 06 Jul 2026 17:15:21 +0000 Message-Id: <6a4be2a9.31a29.5d355ed7@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=bf142ea4760bd4391092d9cc0038a0870cf7e0b2 commit bf142ea4760bd4391092d9cc0038a0870cf7e0b2 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-07-06 16:23:56 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-07-06 17:13:53 +0000 if_ovpn: Fix memory leak in VNET during unload Unloading if_ovpn while it's in use by other vnets causes memory leaks and panics. Fix this by reverting VNET_SYSUNINIT and adjusting the SI_SUB initialization order. Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54175 --- sys/net/if_ovpn.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/sys/net/if_ovpn.c b/sys/net/if_ovpn.c index b4796fb95589..19fab11f3dde 100644 --- a/sys/net/if_ovpn.c +++ b/sys/net/if_ovpn.c @@ -2847,9 +2847,19 @@ vnet_ovpn_init(const void *unused __unused) }; V_ovpn_cloner = ifc_attach_cloner(ovpngroupname, &req); } -VNET_SYSINIT(vnet_ovpn_init, SI_SUB_PSEUDO, SI_ORDER_ANY, +VNET_SYSINIT(vnet_ovpn_init, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY, vnet_ovpn_init, NULL); +static void +vnet_ovpn_uninit(void) +{ + + if (V_ovpn_cloner != NULL) + ifc_detach_cloner(V_ovpn_cloner); +} +VNET_SYSUNINIT(vnet_ovpn_uninit, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY, + vnet_ovpn_uninit, NULL); + static int ovpn_prison_remove(void *obj, void *data __unused) { @@ -2891,12 +2901,6 @@ ovpnmodevent(module_t mod, int type, void *data) case MOD_UNLOAD: if (ovpn_osd_jail_slot != 0) osd_jail_deregister(ovpn_osd_jail_slot); - CURVNET_SET(vnet0); - if (V_ovpn_cloner != NULL) { - ifc_detach_cloner(V_ovpn_cloner); - V_ovpn_cloner = NULL; - } - CURVNET_RESTORE(); break; default: return (EOPNOTSUPP); @@ -2911,6 +2915,6 @@ static moduledata_t ovpn_mod = { 0 }; -DECLARE_MODULE(if_ovpn, ovpn_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); +DECLARE_MODULE(if_ovpn, ovpn_mod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY); MODULE_VERSION(if_ovpn, 1); MODULE_DEPEND(if_ovpn, crypto, 1, 1, 1);