From nobody Tue Nov 17 17:04:27 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 4jTWL42b2Kz71RHy for ; Tue, 17 Nov 2026 17:04:28 +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 4jTWL36wBmz4FsP for ; Tue, 17 Nov 2026 17:04:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935068; 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=ggZWnWToIFZxUVtfXDVBDBCYPuOgn+9S+eT4xJ2UmMo=; b=Pv7yJoOS08tg+ch/cGuFFFQHJwAy0d4XZlVnHrG5IMD0gGyyL7EQNgCTITXJauhQa+L05d hhf3Mx2Ydr481mASMFI0U2QFuERDpqfDX4SqZ0s6e/c1kMs28sZrPI9PqYqrZar/QlLq/9 mXUA5mWkQcayfEuLCiabwvMtnBAHteLrFCtKz1CkFOFdSjK7f9VZwumX2YxPzE7dTmKKeA ZapAye4EeK+RsGNtUXt3yiUNqNYDNttTnlz8HxFsghebBLYJx0qPBXUa4oR04k0REsOUAM LSAWfIs0I+xDjehLDM8X2euAU7wzAbTwFK0YbZ8puAEvWiBYBmcxmFzeOBDPSQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935068; b=TPc4sKW2/0SQMfx05Gjl2HVmUP18p0c81OhULgKMDxxDb4ptsVIEvyeX/DxZqUCwOOuX3s Yn2twu0/MMlvoGVSHwMLurvhSUG8U+IwHzgQEaXaKBc4dJMXtCQDm3WzxSV/a2spEmsfWr CM7Vhs2FHN+o2ITjiGObuEVZAQgt1bT5747VSSlfuhSMrOxqZCawUJkc7PY0DNofGS4wx3 oxbX4fQVVOYAhkeGD2Hb9B9LNesZ4SbEl0e5G9HbLUfBKBThpCLS1Sbx1oKNUNd+ZXjV95 rwWmVBN5Xz+dJJT8o66IRUdGQU0Tmq+3jZ74GHJ6gxeA4CYLzQpQfqUWSUk9eQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935068; 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=ggZWnWToIFZxUVtfXDVBDBCYPuOgn+9S+eT4xJ2UmMo=; b=VVpjQCspeujFcSS6gEVOlRhvbJFPJvsa3RMGY3ueIYBkLhhqiVaE0+l09Q33pC4Ky4ruqz s8OA28MAbTNEC4d5cRG/mGlMz/5pVXllTG7m8W9U47oHELJpU2UMKK5XXyxXCFZNDEv49Y Z+eGmAIsTQfltlW7+irHgg3RK2dFGdDPA2qJOsvQXvgBdaix7PKu3nch5lYmQ15f+pXZS1 X1HiyUzDAV4RXRUGz0SH36Oj7TWwsSx95iziT4rjdLEyqRV8BwEjnyQiLLX+LBtSLhl8B6 r7bnGtAjReROlymkC2v0blaXgOKeKCyhGW2PrVXOiz7P1xbSwPW1FOJzNW8iBA== 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 4jTWL36ZfMzrMk for ; Tue, 17 Nov 2026 17:04:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f06c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:04:27 +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: db2e6660e205 - releng/14.4 - fdescfs: check the target file for FWRITE access when truncating 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/14.4 X-Git-Reftype: branch X-Git-Commit: db2e6660e205b60dfe6614fd8c56d3dfe6431696 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:04:27 +0000 Message-Id: <6afc891b.1f06c.79826ee@gitrepo.freebsd.org> The branch releng/14.4 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=db2e6660e205b60dfe6614fd8c56d3dfe6431696 commit db2e6660e205b60dfe6614fd8c56d3dfe6431696 Author: Konstantin Belousov AuthorDate: 2026-11-12 19:29:20 +0000 Commit: Mark Johnston CommitDate: 2026-11-16 21:16:23 +0000 fdescfs: check the target file for FWRITE access when truncating Truncation is done by calling fdesc_setattr(), and fdesc_setattr() looks up fd N again, so a concurrent dup2() can swap the file between the access check and the truncate. Correct the rights checked for the setattr(). Unlock the fdescfs vnode around fdrop() of the underlying file. Approved by: so Security: FreeBSD-SA-26:91.fdescfs Sponsored by: The FreeBSD Foundation --- sys/fs/fdescfs/fdesc_vnops.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c index 8e66267901c2..2776b99b49f2 100644 --- a/sys/fs/fdescfs/fdesc_vnops.c +++ b/sys/fs/fdescfs/fdesc_vnops.c @@ -528,19 +528,24 @@ fdesc_setattr(struct vop_setattr_args *ap) return (EACCES); fd = VTOFDESC(ap->a_vp)->fd_fd; + cap_rights_init(&rights, CAP_FUTIMES, CAP_FCHMOD, CAP_FCHOWN, + CAP_FCHFLAGS); /* * Allow setattr where there is an underlying vnode. * For O_PATH descriptors, disallow truncate. */ if (vap->va_size != VNOVAL) { - error = getvnode(td, fd, - cap_rights_init_one(&rights, CAP_EXTATTR_SET), &fp); + cap_rights_set(&rights, CAP_FTRUNCATE); + error = getvnode(td, fd, &rights, &fp); + if (error == 0 && (fp->f_flag & FWRITE) == 0) { + error = EACCES; + goto out; + } } else { - error = getvnode_path(td, fd, - cap_rights_init_one(&rights, CAP_EXTATTR_SET), NULL, &fp); + error = getvnode_path(td, fd, &rights, NULL, &fp); } - if (error) { + if (error != 0) { /* * getvnode() returns EINVAL if the file descriptor is not * backed by a vnode. Silently drop all changes except @@ -561,7 +566,10 @@ fdesc_setattr(struct vop_setattr_args *ap) VOP_UNLOCK(vp); vn_finished_write(mp); } +out: + VOP_UNLOCK(ap->a_vp); fdrop(fp, td); + vn_lock(ap->a_vp, LK_EXCLUSIVE | LK_RETRY); return (error); }