From nobody Tue Nov 17 17:01:44 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 4jTWGw5rTLz71QSG for ; Tue, 17 Nov 2026 17:01:44 +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 4jTWGw3pwbz3PQb for ; Tue, 17 Nov 2026 17:01:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794934904; 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=JTqmNu2a7uqZa3qDIYTMs2iUdR5hVd/efkawPN2pwKU=; b=Jv2hA5JVtoODhM0B14cS0iZP8EYSwN6UJkPQ4nN6nm1XdU7fvn+Cv1LjtLEqeUGIB0AnrN FqgBl6+WXxZ2f0MhAuun1ZhPKBmsIkxfVaVfIxjYRferKMo2EXIO2uAO3sDjfIADAghsuO 7Hf1kCRAiQxz2IN1m2VYpXY8zp4Wf2Acj3hhbsQIPt7m4Inm1Gz1cwCh1tbegVSVzxgLY4 UKJCsoZd6UDgiALq4qmzbyPYbY19heRWs6XbGXV9bqGT0keH6qqhcdHg9gT3dMiFCcRBc6 ssth6d6oQOhNUQdlerdyLgwynC6ruMAVdVkwkjNh5BAL1IEZ8jcC4/s7zLZJag== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794934904; b=GlOjOOKOXtDetfiKAY1k3/5gBk0samKCDJ7NfpziPjtGrmX/3kg0GEIjpVfCs15kU7ACOW 1bfI4eXhMTNcgxKo1gnCtaHomE0j5aiZXz48ga0DUZAuGUgtE7+CoLR4Gl7/x1B/5MsnwG L+9x+kAn4W4PCdNArR5Je23+qvMTs0PfwM7AKahzwtsZ/4MY/uKtRT1KjaB72wUkEljsh0 MQaDonO1nWz3154sVTUkOX4FtbqPazSsyOqpIBTwN757Dym7bTxMHcQ44adK6xi5bKuvXe +HSjER/baGaYZsYL7f6gPXW3rficoIgpvYAcAAFar7JRXqduTSk71JhBZ3Ocpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794934904; 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=JTqmNu2a7uqZa3qDIYTMs2iUdR5hVd/efkawPN2pwKU=; b=hMkgovFdfsHFpCTxi5eHu1OdfCCJfr3VvTI77kI3h9FWgVrasibXT9I2XPZc70QI2nvWts zvCD93u2p26fz22dbt4ly/LIm3XlZLpp0m5rcJt3BPBPHVGgRBe2Bm4EeySYpfoUa1XzVm nHo7hwLYXvZGbSZ58aI6GduNm+REfGp8K9kPI6F0TjZiUm6UQ3Uzfpxkyhl2yVEgRbAYO4 afU4Q/+WmwD0zPnrGFVp7JMicjnGcTDyzbAMJJWKDYMEVyWc0+Vz+A/gJaNseLXQxqeBeo X4Z6hcAvMqHwk/nOXlfbVPQobfHwj/yzFVHz7pM585uVLI1Dl/By+tkXFHM20w== 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 4jTWGw38vzzr7w for ; Tue, 17 Nov 2026 17:01:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e899 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:01:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Konstantin Belousov From: Mark Johnston Subject: git: 39d695094763 - main - rbeneath lookup: do not allow to step up with dotdot lookup over VV_ROOT 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/main X-Git-Reftype: branch X-Git-Commit: 39d695094763e0701547d98e5eae8b759fe1409e Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:01:44 +0000 Message-Id: <6afc8878.1e899.4e607378@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=39d695094763e0701547d98e5eae8b759fe1409e commit 39d695094763e0701547d98e5eae8b759fe1409e Author: Konstantin Belousov AuthorDate: 2026-10-23 03:48:47 +0000 Commit: Mark Johnston CommitDate: 2026-11-17 16:57:00 +0000 rbeneath lookup: do not allow to step up with dotdot lookup over VV_ROOT In vfs_lookup(), the ".." loop steps from a mount root to its mnt_vnodecovered vnode before the name is looked up. nameicap_check_dotdot() runs only after VOP_LOOKUP() and compares the directory being left, ni_dvp, with ni_rbeneath_dpp, the start. After the mount crossing ni_dvp is the covered vnode, not the start, so the comparison never matches and ".." is allowed. [*] Before 2f60984053 the loop called nameicap_check_dotdot(ndp, dp) right after the mnt_vnodecovered step, and the covered vnode, which was not among the vnodes the lookup had visited, was refused. The change replaced the visited-vnode tracking with the comparison against ni_rbeneath_dpp, and removed that call. A process restricted to a directory descriptor by Capsicum (capability mode, or a descriptor limited with cap_rights_limit()), or a program that relies on O_RESOLVE_BENEATH / AT_RESOLVE_BENEATH to keep a lookup beneath a directory, is not contained when that directory is a mount root (for example a tmpfs, nullfs or devfs mount handed to a sandbox). Through ".." it can name anything reachable from the directory that holds the mount point, within the descriptor's rights and the usual permission checks. Sandboxes that are handed a mount root (a per-sandbox tmpfs is a common pattern) lose their file-system boundary. Similarly, if the ni_rbeneath_dpp is reclaimed and then re-instantiated, e.g. for nocache nullfs or just by vnlru, the startdir might be bypassed because the comparison would not hold. Check for doomed state to close the possibility. Approved by: so Security: FreeBSD-SA-26:81.vfs Security: CVE-2026-101312 Reported by: pjd [*] Fixes: 2f60984053e5 ("namei dotdot tracker: take mnt_renamelock shared to prevent parallel renames") Sponsored by: The FreeBSD Foundation --- sys/kern/vfs_lookup.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index abf306ac9102..6a7d76154d5e 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -1069,6 +1069,18 @@ vfs_lookup_isroot(struct nameidata *ndp, struct vnode *dvp) dvp == rootvnode); } +static bool +vfs_lookup_invalid_boundary(struct nameidata *ndp, struct vnode *dvp) +{ + struct vnode *ndpp; + + ndpp = ndp->ni_rbeneath_dpp; + /* The doomed check prevents escape through the startdir reclaim. */ + if (dvp == ndpp || (ndpp != NULL && VN_IS_DOOMED(ndpp))) + return (true); + return (vfs_lookup_isroot(ndp, dvp)); +} + /* * FAILIFEXISTS handling. * @@ -1418,7 +1430,7 @@ dirloop: for (;;) { bool isroot; - isroot = vfs_lookup_isroot(ndp, dp); + isroot = vfs_lookup_invalid_boundary(ndp, dp); if (__predict_false(isroot && (ndp->ni_lcf & (NI_LCF_STRICTREL | NI_LCF_STRICTREL_KTR)) != 0)) { if ((ndp->ni_lcf & NI_LCF_STRICTREL_KTR) != 0)