From nobody Fri May 19 20:27:49 2023 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 4QNJLY4LV7z4CLYd; Fri, 19 May 2023 20:27:49 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QNJLY3hhPz3PfJ; Fri, 19 May 2023 20:27:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684528069; 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=jU8jx+67ntGJcUlDY1L+AntLykE1UQ0FZ//EMOQi90I=; b=tliHjzFJ6in19OhgCn3PXjok06Cdnd+KuEs+hwy/gQItl7E6hLYxDzG1R2753BDaCoubHS MBiA/+DYmbpYIZEky/ul3jisFxuUNgmFhNV40REyA7AZliwc7KwgL20wgXZ8BQOi16L9zE IGilanOZ1po/WUaL+iEpF4M63DM/P8SVKtFz591/co8IRaPGwqQf1WEudRbN4NScpTjUUn CFPUNzw4XQoZEu3V9AVI+48FsxbPUFlRKu6KJJSFp90ZPAjPCic9vtjZd0JaZVh5tTL/5P Y7V8n4TOkzTzW+iPNDSgCNdkbdQz6vFrt785l5Oy9AQXWVp3E3INhYmmqec+Jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684528069; 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=jU8jx+67ntGJcUlDY1L+AntLykE1UQ0FZ//EMOQi90I=; b=VTpaviQMD0aUNUjJQRDLrTJHIN0Qch+/v6VD3bALHrQxXQEJuYKvMLZKu4ZKwsGwK4k3ky qRlgB3Gux/mRSzLSpGY2J2B+yZ0jBBzu1MRADaFF3m/P/NA7OegPqROacoB5McvOIcxW72 ED2mb7NyGYr+HT4Vu0+rUCIR64mdXbJNGiTYkbxTycomjCSrFp3rps/rK15g1tgvTpF4Ps h5CDjE6r0wzg+cXrYc5WJJYhlixO0O1iJoLezAzFt4ebvrrtQ2F1Z0KuQB8rd3A3gc2dK6 mqwcsMvUUPCPj3AMIPPj0cJQ5ys8DmuKkZaPHZ2WaLKt/yJ2LPAlFs9ep9fC4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684528069; a=rsa-sha256; cv=none; b=y3d05Lx0vxXFEE+lidOxbZPm3enKunWafRadZlcej+87e7DYeLXD/oYokAcJdJIqBjdQ+b zZjyC/XsOurYm2SYXm1EASUeYQvF9lvwY/O6ePqwfKzMGagryhtnJ56/xsM+1lrVq1ae/8 2eNt/gYKjtFaNClAVLiuQYLKd7u5srbQAxVoRgaxxFsqVYvX5C3JD1jFBgpVFcvdCOwY/B XGofxr29pMGQTUG+d84+UeOXOIuzibxlG66ul/eNZ+0hypcompT6VfgI48rRpFFika+WD2 oTxWjI9zUB+zOK4pCt0+KpXygkr2ozo1OWzocFALoKDJvtn4OS3ix1TmUU8K3g== 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 4QNJLY2lzSzhx0; Fri, 19 May 2023 20:27:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34JKRnZg018937; Fri, 19 May 2023 20:27:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34JKRn3d018936; Fri, 19 May 2023 20:27:49 GMT (envelope-from git) Date: Fri, 19 May 2023 20:27:49 GMT Message-Id: <202305192027.34JKRn3d018936@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: eb6588af1585 - stable/13 - kern_jail.c: Remove #ifdefs for VNET_NFSD 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: eb6588af1585f4c2d7a1a4df6bae164bd6a063a6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=eb6588af1585f4c2d7a1a4df6bae164bd6a063a6 commit eb6588af1585f4c2d7a1a4df6bae164bd6a063a6 Author: Rick Macklem AuthorDate: 2023-03-02 21:13:24 +0000 Commit: Rick Macklem CommitDate: 2023-05-19 20:26:53 +0000 kern_jail.c: Remove #ifdefs for VNET_NFSD The consensus was that VNET_NFSD was not needed. This patch removes it from kern_jail.c. With this patch, support for the "allow.nfsd" jail parameter is enabled in the kernel for kernels built with "options VIMAGE". (cherry picked from commit cbbb22031f9b957967c03dc8e685392f7d7e7fb8) --- sys/kern/kern_jail.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 0203dcd0faf1..d43d2326cfec 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -216,7 +216,7 @@ static struct bool_flags pr_flag_allow[NBBY * NBPW] = { {"allow.unprivileged_proc_debug", "allow.nounprivileged_proc_debug", PR_ALLOW_UNPRIV_DEBUG}, {"allow.suser", "allow.nosuser", PR_ALLOW_SUSER}, -#if defined(VNET_NFSD) && defined(VIMAGE) && defined(NFSD) +#ifdef VIMAGE {"allow.nfsd", "allow.nonfsd", PR_ALLOW_NFSD}, #endif }; @@ -1888,12 +1888,10 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) } #endif -#ifdef VNET_NFSD if (born && pr != &prison0 && (pr->pr_allow & PR_ALLOW_NFSD) != 0 && (pr->pr_root->v_vflag & VV_ROOT) == 0) printf("Warning jail jid=%d: mountd/nfsd requires a separate" " file system\n", pr->pr_id); -#endif drflags &= ~PD_KILL; td->td_retval[0] = pr->pr_id; @@ -3473,12 +3471,7 @@ prison_priv_check(struct ucred *cred, int priv) case PRIV_NFS_DAEMON: case PRIV_VFS_GETFH: case PRIV_VFS_MOUNT_EXPORTED: -#ifdef VNET_NFSD if (!prison_check_nfsd(cred)) -#else - printf("running nfsd in a prison requires a kernel " - "built with ''options VNET_NFSD''\n"); -#endif return (EPERM); #ifdef notyet case PRIV_NFS_LOCKD: @@ -4230,7 +4223,7 @@ SYSCTL_JAIL_PARAM(_allow, unprivileged_proc_debug, CTLTYPE_INT | CTLFLAG_RW, "B", "Unprivileged processes may use process debugging facilities"); SYSCTL_JAIL_PARAM(_allow, suser, CTLTYPE_INT | CTLFLAG_RW, "B", "Processes in jail with uid 0 have privilege"); -#if defined(VNET_NFSD) && defined(VIMAGE) && defined(NFSD) +#ifdef VIMAGE SYSCTL_JAIL_PARAM(_allow, nfsd, CTLTYPE_INT | CTLFLAG_RW, "B", "Mountd/nfsd may run in the jail"); #endif