From nobody Wed May 28 15:42:33 2025 X-Original-To: dev-commits-src-main@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 4b6tzt3hqHz5wtRQ; Wed, 28 May 2025 15:42:34 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6tzt1jhWz4LBt; Wed, 28 May 2025 15:42:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748446954; 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=POm20SXdejKXr6dRMqFlRNB/El/Uw/hjgv6kJtWK7QA=; b=XVV/HGh1FSbtstaXPDyzYiu8bZ3svne6TOSLut5pxzf1y8prhjjP3radND0IodfQ/NxW3h eP+AXIr+nzjvOut4iXKAt14EbTxf8Jr5YBxZCcj3iOQabj+bMNfVgny5hLOB+TIO1wuEMA JMsDAW7akezztHB/nYLyoZB0ujOMUXEUARWKHuAn7j66ysITLGm8ItgV3ind77S+AQKtE0 hXdQKE3nDACoPFwKNvSvj7+iMq+cGX6s9c4r8zVQ1t7mpnQ8iuUcoNqG2iynGHP1j86bI4 RUA1299EKr4t46Tu2PAkrlsNUmF8rYa2KO2eycMdCthhRgbLuFP0kQYbuq4SJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748446954; a=rsa-sha256; cv=none; b=duhYjmmGT+G8GxeF9YpGXXm3gcIKg71e8SwoJctUd+SZTXkwFFZP2oEV+kMTsQR4mJNfOQ 037uZ2d0z3VzoAbbL6wJ2bEkk7BwwZAYFmOLt3LBzyJDW60TxrHxzSj9bXXWmPXYNDXhm2 z2UscVB2/BUOxE9LdXfLTC2Hz/jNUFRtw7aQxZH5+ZkLGxtDaSpe6MUMzibIuQyd4XF3IL 0tAMmUKa1gPc0c9DX/6OyKCZn4MUH1UNrRqFqOel6xTjhm+Mr0gLML9BOfyuzKYk9w+FGB atMgnDjJHVcPuMkujGFyZklP4wcTAWkNf3so61szL4pB0aws4b7MXfopyZiybQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748446954; 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=POm20SXdejKXr6dRMqFlRNB/El/Uw/hjgv6kJtWK7QA=; b=O/jWobG5jkWp70SJ5RTdGKuevBdIh/7hbi3Iqu+FAE8/xdkoWdclfv6vfUK+nAV8vKjrxY 2Qb/Tg6chyi3Eathfx62rdZK9qFqeF0NvHrD4/+il1SVp4YIBr4mgqvXDThMmlqx/27of+ JsIP4hTIGYJblNdFydXJrHaUvF7KaGY8WXYy+UBD1KsMOpcR0mt5R6iem8hVAf4XtB0eGx 1KqDCaWJso+/IlTlmd8IY7hAaKG1oLUAPjyDZAXeFQkvGBnuZizNr+Uxgva4lQ8DJdx99j xM1aetN7mPhmg9zARybHKmDp/LLNY4W/Ay/NVVFYQNdsZ06B+FOhiPGfrvZIyA== 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 4b6tzt0jGpzkCh; Wed, 28 May 2025 15:42:34 +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 54SFgXqb060439; Wed, 28 May 2025 15:42:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SFgX01060436; Wed, 28 May 2025 15:42:33 GMT (envelope-from git) Date: Wed, 28 May 2025 15:42:33 GMT Message-Id: <202505281542.54SFgX01060436@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: e05e33041c25 - main - vfs: Don't clobber namei flags in vn_open_cred() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: e05e33041c252dc236939683c01ca4b7b083562c Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e05e33041c252dc236939683c01ca4b7b083562c commit e05e33041c252dc236939683c01ca4b7b083562c Author: Mark Johnston AuthorDate: 2025-05-28 13:35:24 +0000 Commit: Mark Johnston CommitDate: 2025-05-28 15:41:53 +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 --- 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 696f5c11c8fc..9b891019bbc6 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -187,11 +187,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) @@ -202,12 +202,17 @@ open2nameif(int fmode, u_int vn_open_flags) res |= OPENWRITE; if ((fmode & O_NAMEDATTR) != 0) res |= OPENNAMED | CREATENAMED; + 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); } @@ -258,7 +263,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. @@ -267,8 +274,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) @@ -348,9 +355,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)