From nobody Mon Jun 30 14:21:27 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 4bW7d35QVkz60X7L; Mon, 30 Jun 2025 14:21:27 +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 4bW7d34NPgz48Kh; Mon, 30 Jun 2025 14:21:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751293287; 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=rtYkXFCN1i2+gbWbgkU+SGqOvDJZ2/fCpD7cNXxLapU=; b=lIEBezHcbKasps/3E6U31HBFzTA1/jrm/al9sfctaAOPZl19sDFzci83fcWGvFI7PNnGcH O+Kr6m6JSVyn9+HqCDdF3p+vzZh7OYA0otlDhUpyT7vA2aoDUuWjpKWkJdHBYPoMYrvLKk 8N8fvSeEexiqjTWNNkN1UqaMePz8qn8kKuOt1qGIR4VDQGoi/o0N76pYL2PvXp2pj8/7C5 r5Nr/IUI8QZyMkeT02GimInR3MNX+X76PvJ0s0iVrqLJYYZ1sNXp1cZN13+RvuayCBJWgI 1Lq5Uvlj7ulufOXFbPXvwmhaAD65lXtBiPId+MPtoWww0vpqxIwVaAVNvSTyPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751293287; 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=rtYkXFCN1i2+gbWbgkU+SGqOvDJZ2/fCpD7cNXxLapU=; b=u2bXdHSPFtkM+MWTF0st0bn4mScIIECohrm3IWQJ1UZ3vOkBOMd0eEGr2+2LZK9rqdka1I EuGBBojUF7rB8Y7RsHHbUEuTntLsQjmIMA+YGKs6bQeFhqr4qkcWPJFBVxaMz3dnRffBFa iYygMqqAnFtA5APYyg0wv+RqqfhzRL61gROdEJzSRsVDjx5ZHjgw8WTvdWLfR1DW9OyKKu PnNpo/bXVsYhxFxtNSbvf6epHYP8njsd4D3kHJ9IGWc/IvmeQll8gU0isJdtG51u2ku29v FY5dS4Fg0frmZyDAF8kSS9b+HWCUGs4OYbcsbZNJ9RkXOn80og+RsHfJVm3v3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751293287; a=rsa-sha256; cv=none; b=gkIna0xS/szJsNkiVFg8qQvhSpsWmmKxUPOlzB9xElKomXnWAW6ahI2sHVCEyEdAx1j0Sx zUwaW4ydsadwQjj8uarAND+ues3W68imzsFCcrYAojlavL+yKXPVDCsGmHfpzfgUImWppJ yGBRy8IZz9Sdmxv2qcZ4NVYefNgkXCACav94tumP9z/ND4ppdjtN1An5WUcT8SOOc2SzP4 CI1vjKpGW4puu/57cNvwuPmj+aZN9VzbtwalGWXrtj9HGsuifVHPWFgm0L1ygZ0On2Kv5l Xe1WTL0RIPUjW72RVucjebFz7Xh7fCw7uOr3jfm8pI9LVCrH+JIFxQvvah3X5A== 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 4bW7d33vvRz179C; Mon, 30 Jun 2025 14:21:27 +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 55UELR3h076144; Mon, 30 Jun 2025 14:21:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55UELRpd076141; Mon, 30 Jun 2025 14:21:27 GMT (envelope-from git) Date: Mon, 30 Jun 2025 14:21:27 GMT Message-Id: <202506301421.55UELRpd076141@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: a66767844690 - stable/14 - vfs: Don't clobber namei flags in vn_open_cred() 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: a66767844690dfd82e14df2d22bd9bc40e46546b Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a66767844690dfd82e14df2d22bd9bc40e46546b commit a66767844690dfd82e14df2d22bd9bc40e46546b Author: Mark Johnston AuthorDate: 2025-05-28 13:35:24 +0000 Commit: Mark Johnston CommitDate: 2025-06-30 14:19:30 +0000 vfs: Don't clobber namei flags in vn_open_cred() Otherwise NAMEILOOKUP is cleared. More generally it seems quite surprising that the flags set by vn_open_cred() callers are not automatically preserved. Modify open2nameif() such that it takes already-set namei flags into account. Reviewed by: olce, kib Fixes: 7587f6d4840f ("namei: Make stackable filesystems check harder for jail roots") Differential Revision: https://reviews.freebsd.org/D50531 (cherry picked from commit e05e33041c252dc236939683c01ca4b7b083562c) --- sys/kern/vfs_vnops.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index c447ceea1634..c3666ca99c26 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -197,11 +197,11 @@ vn_open(struct nameidata *ndp, int *flagp, int cmode, struct file *fp) } static uint64_t -open2nameif(int fmode, u_int vn_open_flags) +open2nameif(int fmode, u_int vn_open_flags, uint64_t cn_flags) { uint64_t res; - res = ISOPEN | LOCKLEAF; + res = ISOPEN | LOCKLEAF | cn_flags; if ((fmode & O_RESOLVE_BENEATH) != 0) res |= RBENEATH; if ((fmode & O_EMPTY_PATH) != 0) @@ -210,12 +210,17 @@ open2nameif(int fmode, u_int vn_open_flags) res |= OPENREAD; if ((fmode & FWRITE) != 0) res |= OPENWRITE; + if ((fmode & O_NOFOLLOW) != 0) + res &= ~FOLLOW; if ((vn_open_flags & VN_OPEN_NOAUDIT) == 0) res |= AUDITVNODE1; + else + res &= ~AUDITVNODE1; if ((vn_open_flags & VN_OPEN_NOCAPCHECK) != 0) res |= NOCAPCHECK; if ((vn_open_flags & VN_OPEN_WANTIOCTLCAPS) != 0) res |= WANTIOCTLCAPS; + return (res); } @@ -247,7 +252,9 @@ restart: return (EINVAL); else if ((fmode & (O_CREAT | O_DIRECTORY)) == O_CREAT) { ndp->ni_cnd.cn_nameiop = CREATE; - ndp->ni_cnd.cn_flags = open2nameif(fmode, vn_open_flags); + ndp->ni_cnd.cn_flags = open2nameif(fmode, vn_open_flags, + ndp->ni_cnd.cn_flags); + /* * Set NOCACHE to avoid flushing the cache when * rolling in many files at once. @@ -256,8 +263,8 @@ restart: * exist despite NOCACHE. */ ndp->ni_cnd.cn_flags |= LOCKPARENT | NOCACHE | NC_KEEPPOSENTRY; - if ((fmode & O_EXCL) == 0 && (fmode & O_NOFOLLOW) == 0) - ndp->ni_cnd.cn_flags |= FOLLOW; + if ((fmode & O_EXCL) != 0) + ndp->ni_cnd.cn_flags &= ~FOLLOW; if ((vn_open_flags & VN_OPEN_INVFS) == 0) bwillwrite(); if ((error = namei(ndp)) != 0) @@ -325,9 +332,8 @@ restart: } } else { ndp->ni_cnd.cn_nameiop = LOOKUP; - ndp->ni_cnd.cn_flags = open2nameif(fmode, vn_open_flags); - ndp->ni_cnd.cn_flags |= (fmode & O_NOFOLLOW) != 0 ? NOFOLLOW : - FOLLOW; + ndp->ni_cnd.cn_flags = open2nameif(fmode, vn_open_flags, + ndp->ni_cnd.cn_flags); if ((fmode & FWRITE) == 0) ndp->ni_cnd.cn_flags |= LOCKSHARED; if ((error = namei(ndp)) != 0)