From nobody Fri Nov 21 15:19:24 2025 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 4dCf5T0zpQz6HLnX for ; Fri, 21 Nov 2025 15:19:25 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCf5S4CYyz3nyd for ; Fri, 21 Nov 2025 15:19:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738364; 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=ar0lbrlctygXlGJv7lfXH8MJrT19mCNHFyeB5L7aYxc=; b=qhGFjaaeSMnUuhFwIQ78HU/FJ/XGARzdw7Jic4rA4rEwsblsdRLaiy8dLqGsMIQnMDG8rk /nHYAwYTus9kV5m808CHU4sM+lcmlHOSZHXD7yxH0InkYcSlb15nD/Gmc6hOcaPgeUBM/x Yeb6VM9vzBTgoVwj8QDH/taE8XI+ktY+XuJbRwS1lG9Ej1u0N1tzyzO7GyM58/IUAyr4/N KvgfqEUb1btWCneP6MIVdjV5unxqjJ6YYBbCFn4k1Z2dmAyxpVPRMeB0TxJHc7o8opW1Ml QUhzpf1t1aSQsSv3ZaXfQ440osTJG8QdfalhZnMCNHSNYW4yypk9p8Xh0V8Mtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738364; 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=ar0lbrlctygXlGJv7lfXH8MJrT19mCNHFyeB5L7aYxc=; b=Y6kORoWitIXJMFUzrIiTYS3USlQ65Luql2uR86prWy6KQw5JFI97+7svxSK2AvKlrsysNW PZLac0u3XZ7mhAZgZCf9/4Uz2VYu/32p53eL8btO5rD0Ro8D3O3FUdC2j29fwBO5se0n3t vVW+YSiIvnrz041N0YpjAV38tueFxixFRF5bIFXpSpDAFB9z0ncgwKffq8oLXy8myoRAaJ dAd0bRmTOnBAk8LSZ1L8Ega6nDVELvPrMSMVUoZRT6UssK7y6KZ6WI6wnEZtfATiRPHpJs DqnAuQqe7QKTq8ruwIbsv/CMJ1cfhbDS57Hhri0TEm10rIKTjtrankmOEHuLhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763738364; a=rsa-sha256; cv=none; b=Z0so8o1Mv2g/PE/U7G3OpRbjN44VBBJeD0PnIImWb6MwqosBsfDRTVmhxI8DZAfDV+3uGH kuDplb1013Fl5eh5JPblxeDHTEgGxFxvk1sS6JtbQv8etPMFl4kjRGHH0Xe1Dxl5p4GlMT ZxpqV816ac86koqTKGzgCURqMAwIZcQvn322p8uq/Y+aLTem5c+qP+6h4qZzgvK2jZ1CuH S/MJLc3JpgCirK5JYffSTcYuxopUm3eNo35iOKVcPH+BzIJDWuYlNSMMMZP236JD0iu6M/ N26CY2TzdmvDN503u6hLRRi0Zw0ZiPCqMV01MhGrV2AAYfYvFukrqDHg8o1Ydg== 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 4dCf5S2vPWz2p8 for ; Fri, 21 Nov 2025 15:19:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2fe5c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 15:19:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 8c63056ea8a3 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 8c63056ea8a34f7ac9cbbfcf6d37c303e1e00a76 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 15:19:24 +0000 Message-Id: <692082fc.2fe5c.5d8afaaf@gitrepo.freebsd.org> The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8c63056ea8a34f7ac9cbbfcf6d37c303e1e00a76 commit 8c63056ea8a34f7ac9cbbfcf6d37c303e1e00a76 Author: Mark Johnston AuthorDate: 2025-05-28 13:35:24 +0000 Commit: Mark Johnston CommitDate: 2025-11-19 20:47:50 +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 6591b543ddea..e685d581733b 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -195,21 +195,26 @@ 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) res |= EMPTYPATH; + 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); } @@ -242,7 +247,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. @@ -251,8 +258,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) @@ -320,9 +327,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)