From nobody Wed May 17 14:40:17 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 4QLwkT4Sb8z4BCNL; Wed, 17 May 2023 14:40:17 +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 4QLwkT33tSz3k7S; Wed, 17 May 2023 14:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684334417; 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=i5Sk7TkYzLrEUyv97kLH2AMrRaHmaN7JVKBxIGqI8zM=; b=GLtcktteTJiemRa4A6XKj6ISCcO+8mLs9mo+S0BzqFbkCsX3hd8L+9FvZGy/8KvMgYuaTi LtMFlRUJk7cwYSfsEY8hknx+Yj5VXJIvrry82ijx0BChCft0IxoYmD28Dg5HzinA4XBPqP n2e3pESq/kZsTI++yyE8y++KKZGVAlChfiUpRLdOY1Xdv+88HNjOGompRf5Q0xumFhYLYG OB4u13tEyV7RIUB4q5sO5pX80MTkVlhicm1XlemBeZcTFkyZq1U/TfRyy87l0GILlRjgHn 0MKhTD1DJVqFZ0N6/lNKSIlJbhlU2SSl6Sgo/5qkXY+a2MapJBffRSt4RZ372A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684334417; 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=i5Sk7TkYzLrEUyv97kLH2AMrRaHmaN7JVKBxIGqI8zM=; b=sd755L1AnYxtR8/6tiG97AX1MHiLV+kP4REEO/tFChCCQmUG5hCZ66XBUPnjhzIwwk2wUt NO15JXMLHrwAqiTay710zwinGf4hoQXWL1qyAtRg6Fa6ljNYXggPZouhrexCb7CmeYXXgG pq84FVKIWPJeyD3nlDxyU/SjZRrqycftnkax0xC46Dfl9WagnUz/YbrPis5o3zW88O6/Ha 8NkviPHLhhde3y+USCJi7RsfTOYQ1c7c79gOVJXKCjmPnCC1VQjEyGQuQm87BPIfaFcxH5 J/s5Ct37wPmkhNsdpvpMoF32sqDDOkxUkLqkgYyPHZa0NDqXWyPEjxMGAQEZbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684334417; a=rsa-sha256; cv=none; b=NGvXUtHmheR/QjFudIij4fSgfj+DEHs2KAk/6uPoUO+izV9JKPsiKLfEsifN8YbZd8O6WY jqa2th5zTEnbe8NqpPw8IeRllJ53bFAAxwOB0xXJqh60p1jGKHBs0rfl8VDzzn0BL4Ha1b kkMNbYi3q5DLRzYH+651peVSflbYR49/aVVlUicG85TwQ2unhRjzwkH7hrPAwL8rxdTvwO mYZ+HsVloxwEk3bAqryRYbajw9sjRUffjbdQG3zyP5lJLZOmNFyUioLacUmWoPwW87n6Bv lNLbkYpSeJ2dm1LolwCNMLLs+/5qYjh427J66pm2Ck33iCa3Yi+UEAcTwjSN1A== 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 4QLwkT1YTXz16yC; Wed, 17 May 2023 14:40:17 +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 34HEeHxm009548; Wed, 17 May 2023 14:40:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34HEeH9h009545; Wed, 17 May 2023 14:40:17 GMT (envelope-from git) Date: Wed, 17 May 2023 14:40:17 GMT Message-Id: <202305171440.34HEeH9h009545@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: abae7d6e2dea - stable/13 - prison_check_nfsd: Add check for enforce_statfs != 0 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: abae7d6e2dea79681ce004937b4cf415463975be Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=abae7d6e2dea79681ce004937b4cf415463975be commit abae7d6e2dea79681ce004937b4cf415463975be Author: Rick Macklem AuthorDate: 2023-02-02 00:02:20 +0000 Commit: Rick Macklem CommitDate: 2023-05-17 14:39:24 +0000 prison_check_nfsd: Add check for enforce_statfs != 0 Since mountd(8) will not be able to do exports when running in a vnet prison if enforce_statfs is set to 0, add a check for this to prison_check_nfsd(). (cherry picked from commit 99187c3a44c2c3e168e462a30d45af075748195f) --- sys/kern/kern_jail.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 0a9d311eeafd..622b9f6c7cb9 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -3194,6 +3194,8 @@ prison_check(struct ucred *cred1, struct ucred *cred2) * - The root directory (pr_root) of the prison must be * a file system mount point, so the mountd can hang * export information on it. + * - The prison's enforce_statfs cannot be 0, so that + * mountd(8) can do exports. */ bool prison_check_nfsd(struct ucred *cred) @@ -3205,6 +3207,8 @@ prison_check_nfsd(struct ucred *cred) return (false); if ((cred->cr_prison->pr_root->v_vflag & VV_ROOT) == 0) return (false); + if (cred->cr_prison->pr_enforce_statfs == 0) + return (false); return (true); }