From nobody Tue Jan 27 19:16:19 2026 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 4f0w9w1XHTz6QJFq for ; Tue, 27 Jan 2026 19:16:20 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f0w9v2r6vz3Dqd for ; Tue, 27 Jan 2026 19:16:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769541379; 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=OGPuFHwZEandI9SGGk6KaAP9TyxgYU6XcfHpp+MkPZw=; b=IpZqAwnF1tQb+EP661wTMvu4edmnM1AIiVHnRdGZ0R2U98p2+tSoJQddz2e3eEQeNbsI3C nkq1fuwyY+kEwA/Uny/nd6grFvoCNk92ixYkMUa2HNkcaEIQAEybEH6hNsPgJzJI8KhBCx 7Co3Mz9sTolMyEehwnaALfQ0jRloa+AtH26JdrNND9R0VyzjqErJd/szRL/l5lJzAksOJX OMm9oYv7SRPXb4Ct1qsKoEOkuw/t+Hihtit6f2quVGZQMRw/pxoqhZJNRPUT7O3oECXpct lhWtXdZyxiUe7P+MGAXKrJ/62MTXABt7OiQap1AyjHabJuvOgAQ4F9WzS9qDPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769541379; 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=OGPuFHwZEandI9SGGk6KaAP9TyxgYU6XcfHpp+MkPZw=; b=AZT9DbuIID5d46PPSy6aaZQtbpebQUPB02corAKnl6gBUo1XkKS1MADI2myRngnaJUbEAf TCIwE54Dh9jr8D5ZG48aIEpwQoG2E2giWdtdRD5lAb9zCJ8MMLMABInP2FBEXj3FfjB/vP iNRD89P9i161EiwhgyC5g4vMHB8uYSe3q1BZz3D6ecBBTwVyCxzbnneM0eNdERULoQMIqw 1zBnog7lICTMIOdvXFKVc9hBK/JmgWAmpf/ZzvYlXbFl/F9/nm3AzQtIoP6IfX1Qlm1eiK nKTKhyr6AVyyBAJT14UdBRjnNBEWWUcnOmd+K6fbYFWQsw5NCiqBRjjr4OOGYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769541379; a=rsa-sha256; cv=none; b=VjO5TNBN92tvcKeQ7ENBKlAXOGB3LCCjMYTTO6F3Kav7/PrRwzy0jjjHKc1yTNbFFTHeNW Nh3Udie0UJebXkg5HRmTdlfH0EB9Lx3WKCATzdDYUvOFcxYiuuaVRmKsgweXozXLVUO2yE H2mOb3BmvXDK40fBJLZVwIAfLAugl7wKLfceh8EHcA1Ykd+IO3OeoSNRgUvT+/yQeAaz5N mBU3+JT1fjCgk6puRJjNPU7EucCvd7VJDBpQhReLgqBBp8/nQg0QKfCCgkPy20LsNxQv+d U8N5AP9xBrsOK5iA/KZs8xJBjO1LPIegq54c958dBLwhpcHMl9qseRYy6NLD3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f0w9v1tw0z48n for ; Tue, 27 Jan 2026 19:16:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24589 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 27 Jan 2026 19:16:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: e89e04ee2708 - releng/14.3 - vfs: Don't clobber namei flags in vn_open_cred() 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/releng/14.3 X-Git-Reftype: branch X-Git-Commit: e89e04ee2708cce696101398c09114c763c35e3b Auto-Submitted: auto-generated Date: Tue, 27 Jan 2026 19:16:19 +0000 Message-Id: <69790f03.24589.2d081bc8@gitrepo.freebsd.org> The branch releng/14.3 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e89e04ee2708cce696101398c09114c763c35e3b commit e89e04ee2708cce696101398c09114c763c35e3b Author: Mark Johnston AuthorDate: 2025-05-28 13:35:24 +0000 Commit: Mark Johnston CommitDate: 2026-01-26 16:49:29 +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. Approved by: so 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) (cherry picked from commit a66767844690dfd82e14df2d22bd9bc40e46546b) --- 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)