From nobody Mon Jul 13 20:49:47 2026 X-Original-To: dev-commits-src-all@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 4gzZLm3QLwz6lmWV for ; Mon, 13 Jul 2026 20:49:52 +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 4gzZLm2KF6z3g9X for ; Mon, 13 Jul 2026 20:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783975792; 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=jlN4kUxUvTIbp7EXgvDYXgQlC7knuv7F8ToXuQS/YlQ=; b=bVsU7eBAPbEWGLNG2lzNB5TQ9alI7x8u+xlSc3e6J3CQ8kJqhykwjjpq8hvnzqAZPAt3WT Og3V+IxFceJHhdC1OnCKam4BulCC7+KDHQ3JX958qFbrKCULjNNgUYYYtvyqZ4qfoJam1r 51Mwcwo9XAPcVGWLn3WdPh3Z/lRpZETq/BTXfWwZnNm8+Bgv7SwL/iZ3teS31EQqC8hA0c 7T1nW1/uqciauJAjApLZ4Vhe4XfO6+W4DjiF32lEitXz4BQERwZvG+ynsZedykf+RmwelS yz93hs4JfCcm3LUiMOmRYTe8le9pzJnhKM/cAsmH2pBEgnS51Jh5eXTIl0GVsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783975792; a=rsa-sha256; cv=none; b=YS/NqlqD0rQGc2aAvh4mgBAmlfspfBtGRrsozlhbaeoMvMjdqkJagziP6tHD2s2jOcMy6A rivZ2fBiBXHRRRs7lbuQLDrx7CjmLcBTQ9ol64cFVyB50HkXAOOHtDwAT6hK6egSRv1VVw jVwya+pA3N9imAe5lLZ1UykNHfm+ZPzGCrtI0UAlvgyG8kR+ZqvZoJ6JHUbyQ+qi2CHRe/ JnNDD66PAoYqc5bmX2S7Cq5dBV4Yx45g0inoMFiySseCTPbCcLkO3nrFy1V0XpLteM2ukX E1iBQ8v3DqHJYWhQkDyJ/8eBy5isez/YBwlp4MzffHvAoAQhhilYQGMFEPqxkw== 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=1783975792; 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=jlN4kUxUvTIbp7EXgvDYXgQlC7knuv7F8ToXuQS/YlQ=; b=ZlGokr3Nt0e8BuMD4dvYi6/zFrg2Lb+7QbXnkmauKoWMfRqylVEiVa0LUCGggcWc389ttL LNH4K2evacg8EBO0Q4bbR2NN0RWpskNhVCRQ7dYYGTL7l1+VdtDWzVUzwwAYR0wqdSMfeZ nIZFlK8PJzRAXrwn2dGzaAYCqtJxdRZ+QOaGWuNyNalzc1w0CqQriqYeQr2xM3QsDJ3Dvs icvPf1AHMxhjVzMkLQ62lAX5V2oOjjH9isHulWP8GwJ0Yi8XQqqCfLgYY2Y5fEk3vN/hyh 1P+8BMjqCRx3HkhBbuJW8vbDmHP4Gor7qyktBfT9tpqa7vmzWiH8+byiMT0P/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gzZLm1FPpz1Crf for ; Mon, 13 Jul 2026 20:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38877 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Jul 2026 20:49:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 7b4bad292d68 - stable/15 - if_ovpn: Fix memory leak in VNET during unload List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 7b4bad292d684323139e674bd9798114a3966f4e Auto-Submitted: auto-generated Date: Mon, 13 Jul 2026 20:49:47 +0000 Message-Id: <6a554f6b.38877.33f44206@gitrepo.freebsd.org> The branch stable/15 has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=7b4bad292d684323139e674bd9798114a3966f4e commit 7b4bad292d684323139e674bd9798114a3966f4e Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-07-06 16:23:56 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-07-13 20:48:26 +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 (cherry picked from commit bf142ea4760bd4391092d9cc0038a0870cf7e0b2) --- 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);