From nobody Mon Jul 13 20:49:47 2026 X-Original-To: dev-commits-src-branches@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 4gzZLg3LnPz6lmkN for ; Mon, 13 Jul 2026 20:49:47 +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 4gzZLg2hhHz3fvB for ; Mon, 13 Jul 2026 20:49:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783975787; 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=a+I/8ZN8Z0koW8zBJwRbkWuws1glbeJcy+v1pGK4KUQwIawFOHti8fJDqJjk0EgPkF2fYO j2tCNtW8T5n+Ehx6noasGayWGC0Dl4AbZ1W+mY90QeajTWh+z1q/8d4kWHECF6QM2MCLsf dfzz4f9ElnrvLr73PU66KZ4hbRXniedT9AutSVwDbPO6VIAF/kUMm/7tP4Yu4rwYuhh+Lv eS+9ojmql51E1+RKEDC9IXtLMxhqpvBAs1NkBrqfLLEnX2bzw7I0u+mhMM3x6n5PKMkrce VuUm85TZ/i/e+CXJCOp+M1i4pBNLqQTKvPgDDcr9kekiQ80MmewLMfU0CTnuyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783975787; a=rsa-sha256; cv=none; b=Yw3ivCV4YLJq8UWtAeswpkbo7Ob/4At7BjoJNRBgDEW2aNaB6rrjnNv7bp0GM4ZivDB7XQ wZ758UqSNQPRMLeHHRKRbi8kofVOYmPqIJoSksEeqe8GDr8m72C0NBpsGUkY3lkDRTvHQe 2x6WwH4gDbVItfYvTMWkbr+QJydKJsvS+slsrWVYpqZXLkA9LSS2lIIhvNgT8fuNlxj0Ip 5+KYfAuyzbW5wOmQ3wVqje7/C8zvwOs9QA/vD3L0zqX9Bk4ZGRODNTL0IoizoAah/hTlMx S1BTz9k3JM0AmmsCB+EcVyJ0Wvo5T7vtDFIBRwOxKA4zSF6ZvmVSOBEjvt2HvQ== 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=1783975787; 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=Jet5nRojhu9WywE3D2peks2SAwM33DJoqY2r51YwPcjZIJcvoJH/Qe3FrPfQmsVAvDISTQ atQnPZ892jZX91sax83dSzbxKP7EHbLIZbbK3xYfDTS17hOB061+/m8VYTgX04oK1DQj+O LNpwWhhM3TYOCn0W1nUGTXd/PgjDFH+TFgqkaOeU0m97BWK0hGofTt3JHVruwrPYECDA3N +T+CO+uhAm9yWr/oyCtsgOnmgc7O646PgMN5c960QJSYTWIaeyDNkfaig6Rv4yAus+tafk 0+J+4nTzWo9FsNasN92tXPlly3CR/MNjVZ/wJSXAt5ov/MwexOO+GNOzOj4xDQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gzZLg14GczWm for ; Mon, 13 Jul 2026 20:49:47 +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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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);