From nobody Tue Nov 17 17:09:57 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 4jTWSP6Grjz71Syl for ; Tue, 17 Nov 2026 17:09:57 +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 4jTWSP3WX2z4Qcj for ; Tue, 17 Nov 2026 17:09:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935397; 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=gNKiuNoRMZ7zh0pxZyvRV4wRhJ5ErS/Rwg+fkO+zvWE=; b=ypEAnJzdIzcTm0oD6j36eyrT+IBdEpGnV5+DpP926gQPfIfFDDu/dg1Lks+dILBofTzYwP tfAVqsd4U2RdW1axwfkBFlbTwy3sMPSw2MEDUi7KsoPi4dE05bsXFaJv8TW87HmPIVjk2j QJEDWcWn50S21SKB8MeCG+iNPdSvaaedYZVlJ4g2tmbK/psi5ed6OOHpEcSKnQtzoTVr5K /aO5Ug8vihwuexYISFFwfY4K7IkFd7Ipm7POOXRE6v/K86uz5rA+tnpR/FBHZOJIQHhKxZ z/inZ8gVQ66RPdDIUu7B7nQ60SIaCRA3s35Qb5VX5hZP5M/raQ5RIqnkaQdPmg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935397; b=fYsZtj92RZDwKv5DQgSOjJb2eDEFIxK58WqmyGhWk5G9PahMN929WPb9TwgyZ7PUbdlEfg fjdN8Kw/6SgMfiM//cv48szF6/XTIlj0mawK83Mf3fBVpY25xVE7Yb8T3Hp8W75gb2Ifzn 3W6K9jiCOHf3kgZsA8BTSa7FQ4utRQ7hL1dNHEH1pp0PqOegzNv2s7rR4R67Toz1UKyNOZ DHwzDYkiyXHR9R2GHa2F9eJ0dEThv7/jJX9wlZyOJmcX2BKjrsMMFk9g3tb9dyuFqhN7l/ j4Uw+5XgBk3WX1uf4KhcPSVmud7wNKdh+FJ+y0XN7+gJ1uVHkYYaFLA75YJ58Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935397; 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=gNKiuNoRMZ7zh0pxZyvRV4wRhJ5ErS/Rwg+fkO+zvWE=; b=TP25ut+F808DaKjNqNsLFIz1YX5YXsWWehBMyvQmT9b3f5KNM/O+3dAgn0gwjO9ZCLhWQH 2WB932rnWNM1uZGPzDE7OStc2A+JUtnvUJYV45NIC5QDGNeuSrDW0DcebeyKXL4BtJkE8t +agKBP/Eq6bRrHlS93K5K1ZceaD+ADUDvbQvLH+gcDqhuF9pCgbz7lIgljHNnOcBCzOtGJ NJD7376wUPmj4ImfcLzSVoJL9Omexa7bJBuB8X/W0rk8W/4IcrAs5YLhDOHAgJd/tn18y9 Py5ew6OL1HO7/acLxmPx2e/uaE+0F6omuzAyRWNXYWaS0risDByGrlxSBGPhAg== 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 4jTWSP2v9Hzrss for ; Tue, 17 Nov 2026 17:09:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ea6a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:09:57 +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: 4150743df922 - releng/15.2 - 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/15.2 X-Git-Reftype: branch X-Git-Commit: 4150743df92267cd1788ddbf4a1e4f923de77d42 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:09:57 +0000 Message-Id: <6afc8a65.1ea6a.484acb9e@gitrepo.freebsd.org> The branch releng/15.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4150743df92267cd1788ddbf4a1e4f923de77d42 commit 4150743df92267cd1788ddbf4a1e4f923de77d42 Author: Konstantin Belousov AuthorDate: 2026-11-12 19:29:20 +0000 Commit: Mark Johnston CommitDate: 2026-11-17 13:36:52 +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: re (cperciva) 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 d29ce4236eac..e312e09cf4a6 100644 --- a/sys/fs/fdescfs/fdesc_vnops.c +++ b/sys/fs/fdescfs/fdesc_vnops.c @@ -525,19 +525,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 @@ -558,7 +563,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); }