From nobody Mon Jul 28 16:19:47 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 4brNwg3tN6z63FR3; Mon, 28 Jul 2025 16:19: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4brNwg39MPz3YYJ; Mon, 28 Jul 2025 16:19:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753719587; 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=Rv3vhg77mhOL5ZI7F+nKcllk1FUu88bRy8kNx6ToJPw=; b=DLKAgIELM50LBQ0kzrnEoy31EHJYgTT8mVddqOhxB7tLtSdFwuuLXmeDmn8PFvXK/XAE6n U90brFeTadfX/AoJYZwoQTKuGumK1GV17upLQI/uTd1oLmHvZEgBvAgZMWZ9/3Jt/0SLiy 4yB7yPi8/aWuKlQFYVNQ7q0bED5wiYvpEttyjfAqxkjAEMLP1ThWO4DDmlvb2/jmQTMFyC eyJ8RGoJDJClnjFO40JoB/35RqP3c0c0hX8ZGcVL8ICrOAfAlJJq3fpWXBh5NGiOuDdZ/x sUDCp899nKjNDrR5SjLLIavMaxjALBZKKKkQmDkbalmS9KTRknLcnJfz5hoRJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753719587; 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=Rv3vhg77mhOL5ZI7F+nKcllk1FUu88bRy8kNx6ToJPw=; b=Bz7sFr/FHszdxT+89wBVuR4Rs3MnXgzI6q9r+UNtLs1XerOSQKOakt6Nhy9gB6ZzkHUD2z gzKfKDtusIOE4UGowGswhNJIes9hSUutLHmhoFTJ1RT1spu2F7U/tQNWVdVxEqF+K0ec3Z d86GbgQu7h28T1ONQ50lShfmFez3CPJkk+ecY4od4l1EhKritpLH8+8gnq2vM2SxExP6Ss OGKX+FtWxw/MBxcgJBsIvRki5YyheDJ+8ujeaoXSgJAWd7VMLFEwgczRZMvbMVS5+ZoWkI Vqsk80Yc4edC6wwv8o0jVwUqN5Bk9Hty64Q9aD2TTUgczAz3O3LdDvl7Fap25A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753719587; a=rsa-sha256; cv=none; b=MRm5UKM+UoLijke1OV+/vlc4bbs3qyH7fE1sGEKWWA3SeUJ5CJOCdgcXsz1Hdcd+N9XTrF Cj0MOl569N7PZTF+LwehN/oJixG21UT+qFNkvPsiIMw/3OmmkX2zHZh6yOaTQNxQl/Ujbb cqjX9HPP1we/VgNo8q5pzwPRH1AtMzrE4cmbXZeSUzuOSYobbj8zPiN29oDkpeL/W1flau 1v9OxnHiCj3K9nTE4s5iW9S2XNFhELRKYq4HTia5VC8muSDr5WnY8Xxp59x5frN/vvyRcS irSgqsEI0IQazybBkLZejDg+1gPHMAvDWBGkFzOJovNPjDnwoNYp8cC1bjMNPw== 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 4brNwg2ZJKzsHh; Mon, 28 Jul 2025 16:19:47 +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 56SGJlug091621; Mon, 28 Jul 2025 16:19:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56SGJllr091618; Mon, 28 Jul 2025 16:19:47 GMT (envelope-from git) Date: Mon, 28 Jul 2025 16:19:47 GMT Message-Id: <202507281619.56SGJllr091618@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 748a4ea1caff - main - 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/main X-Git-Reftype: branch X-Git-Commit: 748a4ea1caffca48c4949d5a7b964853c44fbdae Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=748a4ea1caffca48c4949d5a7b964853c44fbdae commit 748a4ea1caffca48c4949d5a7b964853c44fbdae Author: Mark Johnston AuthorDate: 2025-07-28 15:46:26 +0000 Commit: Mark Johnston CommitDate: 2025-07-28 16:19:38 +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 --- 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 d4529e096929..7ef1d19f0ea8 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -3466,7 +3466,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 @@ -3531,7 +3531,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 @@ -3648,7 +3648,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 @@ -3711,20 +3711,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 @@ -4425,7 +4422,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 46226cc31980..25da134661e9 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -2368,7 +2368,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 08caa9f49270..24c420e2c976 100644 --- a/sys/sys/jail.h +++ b/sys/sys/jail.h @@ -435,7 +435,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);