From nobody Tue Aug 12 12:56:18 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 4c1Whz1trpz64jgB; Tue, 12 Aug 2025 12:56:19 +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 4c1Why3qyPz3KWR; Tue, 12 Aug 2025 12:56:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755003378; 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=7Gbbt6jJdKTMHPGOhgFon6UwWTYBLXDLk9VGTKPO0Uo=; b=O/lFInwcDVoLtqhluAV5yFvLbRE77zYvyN5vG+wwE/kbg1d5pwMheuHOvICwARGh+UrcSj H5W0Aoo8KBRB3DxI8ILuJ3FkpRvvEpfymqns8ZQrztyi31BAlZQF9uA2K70LIYWVvVG5LH TZC5zsBvKmN0EGeyrgpmmMONNvplRx9qScKcl+2mn74Wwo7fhyI++uuPRW9RVYd/u1564A oSt+CbWuSHvmiuKv4jQr13S2DBhH2ziGMoO0iH9V3JNn09GP2EHhkQ1CW1W55Qx3W4FYpq 8tRPtYW/GANxNec2+noU+IyWEhI1lyu+i3d6Ga5OejjvGEQr2Vd/bUO27xpmNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755003378; 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=7Gbbt6jJdKTMHPGOhgFon6UwWTYBLXDLk9VGTKPO0Uo=; b=o44NCo4ow/lacrv01X6crU4Dm5E8PMZXe7ck7hhRHnY0wyNWjD/PvMyMFkzKHteo63qO4n Zxr4BBifq8+Ee4JSY2FJjzjseFWKii7Cf2Ed2japtCXHcPywpJzfGcdKBmjQLjddn4Byc/ Pi0tNTPs6iasl17aJXDjKu/KbMr6pKiRUYjkSg2gNadVmu6I8e6/Gybr0s/MiFc4/DNxXA j51DS+xzb+WFx6SxjGMo6z3tZ5T1Di2CV3hyyFnsbMhkXzpKMkQJvzHyorfZR3S20CAbhH F95mflVVZcahFAvzrX1qkejcQkDS0z5pVRAd98lrRZXihXbAq2Jn49RswzJOyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755003378; a=rsa-sha256; cv=none; b=UPR1eublnUy6mabPbWRgF3HaFrz2aBjhcENWU8RSL7llvqJMs+m3i6pgkvQFt1B/LCEssL bPAH1452+Um/Sx3uPpFVDPkvgw6H5GYhuELkfEegj1VshrReuUIKimS6THlzROv4PIcHsz lXC1zq1yfsjBOfuRVWq6OIppLefXAHVqKPq3wU/cudJnvHsmI8I2hOPQ8HmbvLA1wjZJM+ 9xgOgYMWjp4aVri3AkfMq+RQMg0WkX7Kre1D2fUltngfZNG4kQd5cu0/MLtZmuxuxU51m+ m40ixxNQyWLqYUEYQwTUweL8OMoVM4QJpsCC8dtOuKG6rVuscGdszUiMDxSOrA== 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 4c1Why3MFmzf4s; Tue, 12 Aug 2025 12:56:18 +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 57CCuIQg088579; Tue, 12 Aug 2025 12:56:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57CCuIBj088576; Tue, 12 Aug 2025 12:56:18 GMT (envelope-from git) Date: Tue, 12 Aug 2025 12:56:18 GMT Message-Id: <202508121256.57CCuIBj088576@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: 3cbb5a96bd81 - stable/14 - jail: Make prison_owns_vnet() operate on a prison instead of a ucred 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: 3cbb5a96bd81b5b5d59f6a0a39a2a0f447357deb Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3cbb5a96bd81b5b5d59f6a0a39a2a0f447357deb commit 3cbb5a96bd81b5b5d59f6a0a39a2a0f447357deb Author: Mark Johnston AuthorDate: 2025-07-28 15:46:26 +0000 Commit: Mark Johnston CommitDate: 2025-08-12 12:49:57 +0000 jail: Make prison_owns_vnet() operate on a prison instead of a ucred This will be useful in an upcoming change. No functional change intended. Reviewed by: jamie MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D51524 (cherry picked from commit 748a4ea1caffca48c4949d5a7b964853c44fbdae) --- sys/kern/kern_jail.c | 17 +++++++---------- sys/kern/kern_sysctl.c | 2 +- sys/sys/jail.h | 2 +- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index b14b3218ebb7..0af1bcd775d0 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -3423,7 +3423,7 @@ prison_check_af(struct ucred *cred, int af) pr = cred->cr_prison; #ifdef VIMAGE /* Prisons with their own network stack are not limited. */ - if (prison_owns_vnet(cred)) + if (prison_owns_vnet(pr)) return (0); #endif @@ -3488,7 +3488,7 @@ prison_if(struct ucred *cred, const struct sockaddr *sa) KASSERT(sa != NULL, ("%s: sa is NULL", __func__)); #ifdef VIMAGE - if (prison_owns_vnet(cred)) + if (prison_owns_vnet(cred->cr_prison)) return (0); #endif @@ -3605,7 +3605,7 @@ jailed_without_vnet(struct ucred *cred) if (!jailed(cred)) return (false); #ifdef VIMAGE - if (prison_owns_vnet(cred)) + if (prison_owns_vnet(cred->cr_prison)) return (false); #endif @@ -3668,20 +3668,17 @@ getjailname(struct ucred *cred, char *name, size_t len) #ifdef VIMAGE /* - * Determine whether the prison represented by cred owns - * its vnet rather than having it inherited. - * - * Returns true in case the prison owns the vnet, false otherwise. + * Determine whether the prison owns its VNET. */ bool -prison_owns_vnet(struct ucred *cred) +prison_owns_vnet(struct prison *pr) { /* * vnets cannot be added/removed after jail creation, * so no need to lock here. */ - return ((cred->cr_prison->pr_flags & PR_VNET) != 0); + return ((pr->pr_flags & PR_VNET) != 0); } #endif @@ -4343,7 +4340,7 @@ sysctl_jail_vnet(SYSCTL_HANDLER_ARGS) #ifdef VIMAGE struct ucred *cred = req->td->td_ucred; - havevnet = jailed(cred) && prison_owns_vnet(cred); + havevnet = jailed(cred) && prison_owns_vnet(cred->cr_prison); #else havevnet = 0; #endif diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index 479792b4fff1..46674b9a3ed1 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -2268,7 +2268,7 @@ sysctl_root(SYSCTL_HANDLER_ARGS) priv = PRIV_SYSCTL_WRITEJAIL; #ifdef VIMAGE else if ((oid->oid_kind & CTLFLAG_VNET) && - prison_owns_vnet(req->td->td_ucred)) + prison_owns_vnet(req->td->td_ucred->cr_prison)) priv = PRIV_SYSCTL_WRITEJAIL; #endif else diff --git a/sys/sys/jail.h b/sys/sys/jail.h index 7fbb71ee31f8..6701587f82cb 100644 --- a/sys/sys/jail.h +++ b/sys/sys/jail.h @@ -428,7 +428,7 @@ void prison0_init(void); bool prison_allow(struct ucred *, unsigned); int prison_check(struct ucred *cred1, struct ucred *cred2); bool prison_check_nfsd(struct ucred *cred); -bool prison_owns_vnet(struct ucred *); +bool prison_owns_vnet(struct prison *pr); int prison_canseemount(struct ucred *cred, struct mount *mp); void prison_enforce_statfs(struct ucred *cred, struct mount *mp, struct statfs *sp);