From nobody Tue Nov 17 17:03: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 4jTWJR4D6Vz71Qsd for ; Tue, 17 Nov 2026 17:03: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 4jTWJR2jnCz4CRW for ; Tue, 17 Nov 2026 17:03:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794934983; 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=T72atQNi9Sd4duafszNxJd17mjJWJfdC0Or/rpkVmcA=; b=pqPXtGaVKVvMnyHH9ZeyDJwSSC+6DNssZvWcdPSz2evNeaX4SICpoMK/EXfN8f5WXy/okv dmWxQUu1q6hVZj9X82sU0WMzfOt+jo3sHe0P14mNAejnsLZK+LUnJbzHKDpHTLe6QVNASf QYOzZmoshH8kvS/pArxffmREFfYGj14HZ4QbqycKbFHrof/mPVBCRuk98jWAzkmzXtQEfE hXn2BN3EX/5PyJVzu0TxGby/ZlFkDvppkFDwzj0zG7Ch/ZXHCElYzdYyY6Z/a5rYOFbeCT P6OEKG598kMm1moAdXbO2rJ9KZO1SvIwhnT2GRfLjm1XjGK0M7rAfQOdJBnbQw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794934983; b=togvODzCXJKTkGu8U6Z3lFJeyZldeOtsAx0mjuDZ2c4AxX2Rje6EvIInZXVoIZyLR/ky/W FCNjCpWqYiyqkXci5HApWGPnDt8p1DUGIYgSu/s0Q2wKO+OoDJPSM6ivt13JBrM6WKygum qi2T9ORo5CXOt1g1uhu3aHDAw9rLc5CCLVcb70CEBUAAELCFwzLhgjdGXeqjShTKPGLqqM L6RFXHvrDoD/3D2luXP6kEtxlUTKr6d/DgtenPMSD/Qo0P2QYN1A+Erfy7x+b2MZ+8JwBX GJe2qkJaTlhbN1IYlcgMKEidXsaMmV0y9AgZFfq43fYGpaytPdbluDXII8w1Hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794934983; 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=T72atQNi9Sd4duafszNxJd17mjJWJfdC0Or/rpkVmcA=; b=SCjpo6PaA44faix/u6GLnRJKiXCHU+za/moOsF+u6kZra1ch9+/3O04SllC2pHzY+qMcNj 7GL6HAidnuEzLxOEHHwSZODPWgrz29tqb5sPLTYGzg4446pd9x+y0E6eShWVoSyU6sK/+N GzMBBrc6a29JlzCHHhz8dJynH2cXMOJK7wRMCV1mQe8CdGUp4FZKFOQRE/dUNq67hZn4gx YwK0FMxOibc+xiUOdkZRPRJuFtqGr9ECcZdRbH3srULpFZ9Co/B1XnVrL+wydTY00lseSM wR5qa0aoIQionA6BgHL61n1LZRLpMLTFOv435hP7FKoFLPdPH3UXO9jSCtCTVw== 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 4jTWJR25v1zr6R for ; Tue, 17 Nov 2026 17:03:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e03d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:03:03 +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: 3e29cd164ccc - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 3e29cd164ccc857a3473f73a2910bf411445cb7e Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:03:03 +0000 Message-Id: <6afc88c7.1e03d.4db29695@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3e29cd164ccc857a3473f73a2910bf411445cb7e commit 3e29cd164ccc857a3473f73a2910bf411445cb7e Author: Konstantin Belousov AuthorDate: 2026-11-12 19:29:20 +0000 Commit: Mark Johnston CommitDate: 2026-11-17 13:24:11 +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 f1e204d9b2d0..0f4cdb4f790f 100644 --- a/sys/fs/fdescfs/fdesc_vnops.c +++ b/sys/fs/fdescfs/fdesc_vnops.c @@ -527,19 +527,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 @@ -560,7 +565,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); }