From nobody Tue Nov 17 17:02:03 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 4jTWHH55qdz71QFM for ; Tue, 17 Nov 2026 17:02:03 +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 4jTWHH2nNPz3Q6Y for ; Tue, 17 Nov 2026 17:02:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794934923; 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=ufCTipKgFIpAMk8V6CEZJtcp3mUY3+CzzO7cMHbymuM=; b=flE4ydUX6nXSKDBSHF25as/xEuG2030/3a+E9PqN9SgQKAGLXAkooMJ5Xzy0x0QlFGGBAj SWcMi8k9m9PxudNYZIaFVrBAYVJ5pTfXn6odDdsI/MEEvmqh8VDQ5sCxATw8scyG4R2jfP fTPdzzyj2nDvhJIukVriXjdfUYjz5Hmmq4uq6AnJbmCkfni9VxAKNkxiIrAuyR4vzYT83C jUPI0Kblk5oGXanRr/HX8uu7kvfCMXSHyLwmosDwYlVfj15wcUyO8B1K2smDOhkz3/JK6M g8VhWzc6IMl4eL/ZZ16EkAACxU4cMMfsbJA91dfPqEzIIrl5Q66sKaR1zDJXDg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794934923; b=bQRcb2fLd+g7URnL7KyC7HHh9eJlLrcCJ8ARyWofu9Q9YFM/VjFd2eHdOox18XZEeXPS/9 GlC8CUX0VkiWfBf/fO/MSkmgKJ81r2pgOUKecoB+JZBHVnd/pORvLEMH210i8RZ2RyhcZu SwPVpxQ3JVmVWZb8uulZa1c5+7Rudend9GqEKD0mG1BownICWIC0fbTpcf1nquV/utO5Gj aIKdh3/g39GS+kBoBemcDCYi6d4/5mCYCH/CWDcQefovjLWVk1hYHn7sAyqtjgc9/FWKRD 1BtfJLi7B9ITvfSY2mJwLlVkfTUSh+i4nbAm/t1wYD6daavCTupUqKI7MlTtfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794934923; 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=ufCTipKgFIpAMk8V6CEZJtcp3mUY3+CzzO7cMHbymuM=; b=dfsNES/Ru00dkVroiVSbsf0yNbmoHXPdyFl6PFBF5AHuwMLnFUwYEkCThxJcS2b0MsZZdo RSGGIJnxnl7/xHRo+5Da1/WZKB4LZsT2ag6NX4VvXOVyCxdNpm/LniOcTWviQJHoeNi5ds x8DEPTrQsQoDa+6xTaxiPQ1prkbx4HD/4npudfCTxpP4ekuQDrfvivD3PT03yAe35LTZd6 LmkSy3AzTTC3YAqGND+V7PXbY3ccXPX/omw3tcN5MZyv9aGbvgKkP0LlWqziaO+ynm2GtO kAhewadoIj6Zy/dRruncOmkn9avCJ2fGH545nK9fXpSTC3+qRK4iNXun6VnhOg== 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 4jTWHH2RrzzrTv for ; Tue, 17 Nov 2026 17:02:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1dfad by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:02:03 +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: 538106a3bf21 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 538106a3bf21135f61b7d1bb96a479d543d5edf7 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:02:03 +0000 Message-Id: <6afc888b.1dfad.7dadd51d@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=538106a3bf21135f61b7d1bb96a479d543d5edf7 commit 538106a3bf21135f61b7d1bb96a479d543d5edf7 Author: Konstantin Belousov AuthorDate: 2026-11-12 19:29:20 +0000 Commit: Mark Johnston CommitDate: 2026-11-17 16:57:01 +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 1dd3cc385e9f..523700ea81cc 100644 --- a/sys/fs/fdescfs/fdesc_vnops.c +++ b/sys/fs/fdescfs/fdesc_vnops.c @@ -540,19 +540,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 @@ -573,7 +578,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); }