From nobody Tue Sep 29 16:09:09 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 4hvNQt0klgz6tm3j for ; Tue, 29 Sep 2026 16:09:10 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hvNQs330Fz4r4c for ; Tue, 29 Sep 2026 16:09:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790698149; 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=aP/B6GhwRrGIl/UHsDLqu9YRZ+iyUWRZLOaCWAclSMU=; b=yjQQcfFOHnjhuI61Ws1U6RTCsleZP/0ITnppYA7DuJP05/jIcL+Qs/t785EuxnULFhp+wZ zt/W4NpeJhmEhw9aQO70RfkJu4zo+iPkltIAjOU66Vq5RKKYCxieS4ogfcONJb8BkHM5He mqct6R3XvLINvpmVE4Rw/r+VpFXF9vV64IJlqd37Whz8UiMVhpRBMtwTnZxEvazFuZuJHh 9qqGcHNs2lMoTguSgJInljOsmsXhliCbD3ungJI4k9XsW5N5nR2a+XkVpfa4IaqY43hvZJ JAnJ08EEdS/lp+zzn1hMj1UrqJzQoJHbO3W4EGuNnYr+3gDTrvJrUL62X+itjg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790698149; b=fOEVmdTTAaBuRO4kwA3Rm0H644KQEBP4kXT0ms9UnT1AyoAFcsAnujZ/O16T0a4mWqec2G HK8yzX4N77DK3S9lUvI+8BXrA3Mov299Q4K3A0UFuNoWWtN+7+Q6Dk2WRv8hxx3ULtZP/1 60LAdbBIYQ5kdNF2gKzNSy4VNwLSwSdlLSPKAJHi7ho8jKGV0dTNuCur5Dou33DY/5ecnd /x1arKnng6vxSxnUINAi+sUXBylZx3RkKzxAM0TzCwyWWvI73EVB51brmAGFg/28V+YJmz neL0gk22Ezyjv6eCM2eg1GcwluZIQaUzrflJKStJzZr5ckkJRPTCaaqZkraWsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790698149; 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=aP/B6GhwRrGIl/UHsDLqu9YRZ+iyUWRZLOaCWAclSMU=; b=cDOpJAjEE6TRLDUnaKvoZyMQhxniBwFww0umA6aulSJvg06ZiU7JwlVRXy9mmubW4mXVqe rgPRZSwczgZckqJZLdJ1JmL7Tj/sRUBueqdXA5ao7EpfBgJLMoR2Yp8LBF8xL4O7vxNUV6 EfLvZbxZMohtyZoQF9p/BN3LQmxmVFEM++axvCGbcRZtZxE/RLy/lG23ogLrdAgO3d8zLo 71MmenuCY+AloXhg960NliSOrcspH5h64K/rWKibyT3AVb7jEfeJ6ic/eT9IvlqpBc17+x cY5xqlVUd+HtTpU1DeZBtW5+7t8pzKZePaH9ke87/W3FfsvTBLV4IRZl9MbOvQ== 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 4hvNQs1bLqz1Knb for ; Tue, 29 Sep 2026 16:09:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 273d6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 29 Sep 2026 16:09:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: e42a136d3945 - releng/14.5 - vfs: Disallow renameat() with FD_RESOLVE_BENEATH descriptors List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: 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/14.5 X-Git-Reftype: branch X-Git-Commit: e42a136d3945dd9f0d34c66911481bf0fd60307d Auto-Submitted: auto-generated Date: Tue, 29 Sep 2026 16:09:09 +0000 Message-Id: <6abbe2a5.273d6.fa90af8@gitrepo.freebsd.org> The branch releng/14.5 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e42a136d3945dd9f0d34c66911481bf0fd60307d commit e42a136d3945dd9f0d34c66911481bf0fd60307d Author: Mark Johnston AuthorDate: 2026-09-28 16:47:56 +0000 Commit: Mark Johnston CommitDate: 2026-09-28 19:09:31 +0000 vfs: Disallow renameat() with FD_RESOLVE_BENEATH descriptors The FD_RESOLVE_BENEATH flag was intended to try to resolve bugzilla PR 262179 without entirely disallowing fd passing between jails. However, one can use renameat() to bypass the restriction: upon receiving a directory fd with FD_RESOLVE_BENEATH set, a jailed process can still move its CWD or one of its ancestors to the directory, and just cd out of its jail root. So disallow renameat() when either the source or destination directory fds has FD_RESOLVE_BENEATH set, like we do with fchdir() and fchroot() to prevent similar escapes. Approved by: so Security: FreeBSD-SA-26:66.jail Security: CVE-2026-101305 PR: 262179 Reported by: firk@cantconnect.ru Reviewed by: olce, kib Differential Revision: https://reviews.freebsd.org/D59875 --- lib/libc/sys/fcntl.2 | 9 ++++++++- sys/kern/vfs_syscalls.c | 9 +++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/lib/libc/sys/fcntl.2 b/lib/libc/sys/fcntl.2 index fdd29c9f5d78..427ae28dcfd6 100644 --- a/lib/libc/sys/fcntl.2 +++ b/lib/libc/sys/fcntl.2 @@ -27,7 +27,7 @@ .\" .\" @(#)fcntl.2 8.2 (Berkeley) 1/12/94 .\" -.Dd June 5, 2025 +.Dd September 22, 2026 .Dt FCNTL 2 .Os .Sh NAME @@ -150,6 +150,13 @@ and similar operations, and opening a directory with .Xr openat 2 where the directory descriptor has the flag set causes the new directory descriptor to also have the flag set. +A file descriptor with the +.Dv FD_RESOLVE_BENEATH +set cannot be used as either the source or target descriptor in +.Xr renameat 2 +or +.Xr renameat2 2 +system calls. .El .It Dv F_SETFD Set flags associated with diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index de2261256875..f261e3457122 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -3725,6 +3725,15 @@ again: } tdvp = tond.ni_dvp; tvp = tond.ni_vp; + if (fvp->v_type == VDIR && + ((fromnd.ni_resflags | tond.ni_resflags) & NIRES_BENEATH) != 0) { + /* + * We must not rename a directory relative to FD_RESOLVE_BENEATH + * descriptors. + */ + error = ENOTCAPABLE; + goto out; + } error = vn_start_write(fvp, &mp, V_NOWAIT); if (error != 0) { NDFREE_PNBUF(&fromnd);