From nobody Wed Aug 13 12:02:01 2025 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 4c26Rs3Zr8z64kfQ; Wed, 13 Aug 2025 12:02:01 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c26Rs2pNlz3Gg9; Wed, 13 Aug 2025 12:02:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755086521; 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=aZg7BV3dB8jdz7r6r6xE25hxxzPqaPLIat1bwp03IpQ=; b=wGJIKkM6OwLaOa7XorzlIx+ubkTqqzNm8ceP/uwCyeTHtx/m3oy3U6zEDY1+XTFG3DZKl9 ykTX5KZJHrn9RbPqdKDDTLMVpdVuQOwsodGcvnqO17mNSF5jBI/az6UvUvgLq19OJlmXkU S37qZV2ro6EPvDakKO4yLpZdR92XGBeEaHwRzZmaK5OLSGAUcJHK6BO+C4qfr6EpulPxS4 E48o8Nj/LRoy9THC9vXDyAnA+NJNogG30sgPawTM/RH5LTkNu0zJsymelA3lkU11cjY+1k tKQbyXjmlZtY7i6vkSr0pFZ1sMd17wIWeEkts1I/XHyxGh5IAAXxS8XL6T6V1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755086521; 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=aZg7BV3dB8jdz7r6r6xE25hxxzPqaPLIat1bwp03IpQ=; b=L/kHfmWUNtun4gTaBJgCqmsq6/ddpl2lxoWILU5xOQ0A5wWa2QtyzU11St94t5dL7PoXbA fJpS5Q6bfkjRle1j6pKNHck8PUV6QOqnKzpyEPixr+sx024RGbA8jY1BEbEXFrNu9fnmMz Z2kmNGzG8jk4MP93ob43KEr57gCR6yL1slwy6iS4Hz+AAzhXsuf74HEqRk+a8hNFaX4bh+ HAnFtJfk5wj6u9rzHr30GkWZJqO34/coudNPbnCdF3ZX1rE8UqbdQOvHbqEFy2LzSfo5Gk 7KqHYX+qaugXzzBO6KdVjnPoKXseRw54hafoI/lQN/aV4IZj+Z/coI1EJdjAsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755086521; a=rsa-sha256; cv=none; b=fWzpMUf7jNoRBEJVn9lyt3s8gu0h8vGB9RmZ3ke6LoKzpzaBTv/bBP1iBjXLIbSKVf2wCt mgUZrwBQ5w4fXv39Zl4SJCpcX7y1odb7WzrYm8LApdH3Mm1PJbHLIj9lpWS57vizqsVS1r 7OvDs5hzFrkecpYqiLwg7a9McjmQeYiLwZHvUo5UU53njkXlAgdsZEjqI4xKErnZpMBloW oY1pge+rIgh9c7yuMgw1rgI0+Wr2DTvJbsWOb/9hDGa/7s8+Ft+JrKX8X9GzQH66gW7Fg/ OPk2hc+Y32kewJpVXu20/71ZZFBJRWZMLzpN/VZGfNDuYfYyFMGQQasF7TP0vg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c26Rs1zkhz1LXs; Wed, 13 Aug 2025 12:02:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57DC21K9010404; Wed, 13 Aug 2025 12:02:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57DC21Nb010401; Wed, 13 Aug 2025 12:02:01 GMT (envelope-from git) Date: Wed, 13 Aug 2025 12:02:01 GMT Message-Id: <202508131202.57DC21Nb010401@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: dfd8306a79b5 - stable/14 - if_ovpn: Destroy cloned interfaces via a prison removal callback 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dfd8306a79b5c37f8480112875f12bc8d054d603 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=dfd8306a79b5c37f8480112875f12bc8d054d603 commit dfd8306a79b5c37f8480112875f12bc8d054d603 Author: Mark Johnston AuthorDate: 2025-07-28 15:46:37 +0000 Commit: Mark Johnston CommitDate: 2025-08-13 11:55:15 +0000 if_ovpn: Destroy cloned interfaces via a prison removal callback A if_ovpn interface carries a reference to a socket, which has a credential reference, which holds a reference on the containing prison and prevents SYSUNINITs from being invoked. So, register a PR_METHOD_REMOVE callback and destroy the cloner from there instead, since that mechanism doesn't require the prison refcount to drop to zero first. This fixes a bug where jails get left stuck in the DYING state after running if_ovpn regression tests. Reviewed by: kp MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D51526 (cherry picked from commit 96b29c7f0cffd377a757ad8ccc0cdd8fcb96d0dd) --- sys/net/if_ovpn.c | 48 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/sys/net/if_ovpn.c b/sys/net/if_ovpn.c index e8b2cb0df1a6..7d9c3bb9c951 100644 --- a/sys/net/if_ovpn.c +++ b/sys/net/if_ovpn.c @@ -34,11 +34,13 @@ #include #include #include +#include #include #include #include #include #include +#include #include #include #include @@ -2619,23 +2621,53 @@ vnet_ovpn_init(const void *unused __unused) VNET_SYSINIT(vnet_ovpn_init, SI_SUB_PSEUDO, SI_ORDER_ANY, vnet_ovpn_init, NULL); -static void -vnet_ovpn_uninit(const void *unused __unused) +static int +ovpn_prison_remove(void *obj, void *data __unused) { - if_clone_detach(V_ovpn_cloner); +#ifdef VIMAGE + struct prison *pr; + + pr = obj; + if (prison_owns_vnet(pr)) { + CURVNET_SET(pr->pr_vnet); + if (V_ovpn_cloner != NULL) { + ifc_detach_cloner(V_ovpn_cloner); + V_ovpn_cloner = NULL; + } + CURVNET_RESTORE(); + } +#endif + return (0); } -VNET_SYSUNINIT(vnet_ovpn_uninit, SI_SUB_PSEUDO, SI_ORDER_ANY, - vnet_ovpn_uninit, NULL); static int ovpnmodevent(module_t mod, int type, void *data) { + static int ovpn_osd_jail_slot; + switch (type) { - case MOD_LOAD: - /* Done in vnet_ovpn_init() */ + case MOD_LOAD: { + /* + * Registration is handled in vnet_ovpn_init(), but cloned + * interfaces must be destroyed via PR_METHOD_REMOVE since they + * hold a reference to the prison via the UDP socket, which + * prevents the prison from being destroyed. + */ + osd_method_t methods[PR_MAXMETHOD] = { + [PR_METHOD_REMOVE] = ovpn_prison_remove, + }; + ovpn_osd_jail_slot = osd_jail_register(NULL, methods); break; + } case MOD_UNLOAD: - /* Done in vnet_ovpn_uninit() */ + 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);