From nobody Mon Jul 6 17:15:21 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 4gv9wZ4q7xz6kNLq for ; Mon, 06 Jul 2026 17:15:26 +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 4gv9wZ4JT8z3T1P for ; Mon, 06 Jul 2026 17:15:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783358126; 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=HxYo9MEcSDxZ1OCK+rm6FzU1PCUXWJ+TDooXDEbYRruWsbozG07akKwYZCFDccjEQe2mG9 I8jP8oLdsiPKmKNtSCW7o36N8WV3XWLSejsbaZ52i1M74PhOLey9p7Q//VFCtVC5F/tUPy 7Zg2IHcyNpOazWfisCUN64uBUS5sE2UIlecpVcL5ytckffDjrMsr19lo97GuaKDFUNxySz geUTpSI0mKWEC1n1qgdNb4UR+knkF2neJcJx1y616r6rBEVyyzEo/nruPWXqQwSdyT+T2+ QEkdrC1+diYvaxnWQMLpnB+1YbhS7IVQ8uMBpqxKzgDzRBKkhErbSwWDZ+vofw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783358126; a=rsa-sha256; cv=none; b=G/UiBZxrIgI5XPTlFtWnc6CAwkRZb6jyupqqY8soE11W7Rl2m+jXRx5/QYlNWCCQrzMKhs JylZuU+fn/ergu4W47Chn1xSXiMocO8siomo4MyQ+8nASzcV4dkSpwa582XVTwiI6UQsj5 0cUjBjLAQiOHArdiOZ01bqICkKGrnb0xOJdr+SfFxjxctPiuETXAZSqxrlcmSp5wXAKI4y BQFnEJ0zYnkXAnlygD30RHl8YMdd5p0xvCuTtiFYk7ZXdUJ1jIR67PvFOGYnKIK7JtAbev 9wOFUHEJsvU20xG2ASJXJjet0quvx8MG867x1k/X/KQPHqv87sW/OfUP8Solag== 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=1783358126; 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=efKRJs8AK+7x0t5vNiv41rjs7X44Ef5pdP74TsZ/+gw6ZDE3D2PWVlr/yEQu5+e0zrDFUK y7Df58IRA+FElpGxU44c9czU9YYQWNxop8R1v3BoTuvX8Q5/NSKt1WMvVJ/CYbtS2Z3vSF DRq9uU7xYC2CVgkytzKWDV+Uh7KxAXQaW3RHOm1iJD2wi1guEORwxU/029LIe+NFmQ2Kmt PUjOrA2JzhFzPpLUKZ2AIYo8NUfExaLiq4xMDFSUF7N683hw5rbnYIaNVJK3EXDE3pVinK pKJ6JceJ5w//BLR019TT8WizTMmS5gCgTYiU0KnPShqW4glkQFx1Tnke/gbgrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gv9wZ2zrrz1Cmn for ; Mon, 06 Jul 2026 17:15:26 +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 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/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);