From nobody Tue Nov 17 17:09:39 2026 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 4jTWS35YGyz71SdK for ; Tue, 17 Nov 2026 17:09:39 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jTWS349D9z4QJl for ; Tue, 17 Nov 2026 17:09:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kDz8qh0Ce3mRs3qY8XEVKh+YFGHC/B5LZ63dvnO5+fA=; b=W8hk5NFtFFV2itWkjJX6ht0pH9f+sDnW7+bbL7+eZON3NQzsVqCy03nDj5NPG6in6EqqdJ 4E46g//Yn0pEFTJHaU+d9webqVdmsBFVGVK5FE5JX9sLJfkXTxX72sGEAcvyCYDGnqi4mv OAbRbexxFuaW7aDs6gu9eiaX0ppyKt8/oI0ekZGibF3EX1aP6HoZgDQahKKXCRmfR00Lax 2p91Aw3A8mnD7vqCuNyCNv9pZg7PDGe63GKlOJXPnF1kkWt98XzldZzlh1E+hZrZLWGuCf O+8DzjU7paKvmSVX3QZVEoTl7r9TjC3My4Ha5OifyHqBmEYR3NJqgPAoz1ZrPw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935379; b=vwuzJXcRfAA2MMkq/aLg6cfIM18Qfv3HPCLn9B4CcU5hXQhRUlw4jPeYXRWwr8nichFstf 0cfr8kZqMZpR2JkweXgOYvkLRWWmmgbiX8ZzhqQhkF1HStHJx5SgnlQq1v3pwPm4tV6Yp5 IBH0KsmALneUpVQ2WHUW8vMqckDCaVf3ztk6aJ9//Bis8wpZZZ5dXgIhLo6U4koORUM/WK OeQxUeXwSkOzgp01xsL3xtFo23THs4Fyvb0HEP9vOMqnvtniqsCqZ7vb1dqGa8dHn9KKDK eC4n/VXswoDqC7lRlek3KH7SFnSxRwQAaiV/9/ZL5JI+wsC6InlBGVjZiPkRlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kDz8qh0Ce3mRs3qY8XEVKh+YFGHC/B5LZ63dvnO5+fA=; b=D84U2fPAeDVlUb5jKMApqUI7pgTU3bwakd2wXZsoRYpNdcB4cQKmHOnLytxLFxfn+kIMpU ecdrDb9mkCA7n3fu2UtRrgiRUtwHOWl0AMMHBsrCbyPXwVryRAOFpEle2LHfIjgVpT5o43 Ogst3rsO+h48u2JBeGw+UTWkfHED5rBD1DCTlySAAuftsaqx1/iWRL00hzI4QpyI37noR/ SaVwU5WNOHjia3qMVnBmsWDCT2BcITwv+Yh02YqnFkBQiO0jSuujva42cs3gOQwM5VjYO+ sNuaLkvWBaYUzqR4lRrPJmr2Xugmq2P38IzGEm4OKCnNcQe+cYef8WV/nOSLCg== 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 4jTWS33VddzrqN for ; Tue, 17 Nov 2026 17:09:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e357 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:09:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Mark Johnston Subject: git: bf4379ca1beb - releng/15.2 - rbeneath lookup: move the boundary on union mount fallthrough List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/15.2 X-Git-Reftype: branch X-Git-Commit: bf4379ca1beb27dbdcbc1f545c770e4b7c405891 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:09:39 +0000 Message-Id: <6afc8a53.1e357.3fcd6bc@gitrepo.freebsd.org> The branch releng/15.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bf4379ca1beb27dbdcbc1f545c770e4b7c405891 commit bf4379ca1beb27dbdcbc1f545c770e4b7c405891 Author: Konstantin Belousov AuthorDate: 2026-11-12 20:00:17 +0000 Commit: Mark Johnston CommitDate: 2026-11-17 13:34:58 +0000 rbeneath lookup: move the boundary on union mount fallthrough A name not found in the root of a union (MNT_UNION) mount is looked up in the covered directory. If the union root is the starting directory of a strict relative lookup and the name is a relative symlink in the covered directory, namei() resolves the symlink target from ni_dvp, the covered vnode, without crossing back into the union root. A ".." in the target is then checked against ni_rbeneath_dpp, the union root, which does not match, and the lookup leaves the starting directory. Before 2f60984053 the fallthrough added the covered vnode to the visited vnodes, and the parent of the covered directory, never visited, was refused. When the fallthrough happens at ni_rbeneath_dpp, move ni_rbeneath_dpp to the covered vnode. ".." from the union root steps over mnt_vnodecovered in the vfs_lookup() dotdot loop and meets the moved boundary there, so both directories stay protected. The mount holds a reference on the covered vnode, and the doomed check fails the lookup if it is reclaimed anyway. Approved by: re (cperciva) Approved by: so Security: FreeBSD-SA-26:81.vfs Fixes: 2f60984053e5 ("namei dotdot tracker: take mnt_renamelock shared to prevent parallel renames") Sponsored by: The FreeBSD Foundation --- sys/kern/vfs_lookup.c | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index 4ddf7d5433bf..4708c7aabf43 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -266,11 +266,12 @@ nameicap_cleanup(struct nameidata *ndp, int error) /* * For dotdot lookups in capability mode, disallow walking over the - * directory no_rbeneath_dpp that was used as the starting point of - * the lookup. Since we take the mnt_renamelocks of all mounts we - * ever walked over during lookup, parallel renames are disabled. - * This prevents the situation where we circumvent walk over - * ni_rbeneath_dpp following dotdots. + * directory ni_rbeneath_dpp that was used as the starting point of + * the lookup, or over the directory it covers, see + * nameicap_union_fallthrough(). Since we take the mnt_renamelocks + * of all mounts we ever walked over during lookup, parallel renames + * are disabled. This prevents the situation where we circumvent + * walk over ni_rbeneath_dpp following dotdots. * * Also allow to force failure of dotdot lookups for non-local * filesystems, where external agents might assist local lookups to @@ -303,6 +304,29 @@ violation: return (ENOTCAPABLE); } +/* + * A name not found in the root of a union mount is looked up in the + * covered directory, which is the same directory in the union view. + * If the union root is ni_rbeneath_dpp, move ni_rbeneath_dpp to the + * covered vnode. A relative symlink found in the covered directory + * is resolved from the covered vnode without crossing back into the + * union root, so dotdot from it must be refused as from the starting + * directory. Dotdot from the union root steps over mnt_vnodecovered + * in the vfs_lookup() dotdot loop and meets the moved ni_rbeneath_dpp + * there. The mount holds a reference on the covered vnode until it + * is unmounted. + */ +static void +nameicap_union_fallthrough(struct nameidata *ndp, struct vnode *rootvp, + struct vnode *coveredvp) +{ + if (ndp->ni_rbeneath_dpp != rootvp) + return; + vholdnz(coveredvp); + ndp->ni_rbeneath_dpp = coveredvp; + vdrop(rootvp); +} + static void namei_cleanup_cnp(struct componentname *cnp) { @@ -1365,7 +1389,8 @@ unionlookup: (dp->v_mount->mnt_flag & MNT_UNION)) { tdp = dp; dp = dp->v_mount->mnt_vnodecovered; - VREF(dp); + vref(dp); + nameicap_union_fallthrough(ndp, tdp, dp); vput(tdp); vn_lock(dp, enforce_lkflags(dp->v_mount, cnp->cn_lkflags |