From nobody Tue Nov 17 17:08:33 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 4jTWQp30m1z71SPj for ; Tue, 17 Nov 2026 17:08:34 +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 4jTWQn5nnnz4N9n for ; Tue, 17 Nov 2026 17:08:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935313; 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=aFC3A7HLoHPD+0XYcnaTC/ENhAz7ZEP0OxbvpUqrH7w=; b=pMqIrRPFxQCzJGKerwlVqQY21nEGlvBoWI1L1p0NVbCO6DUaYSGAfYcGa3+EpF5EyNLsM5 sxScqR03tNrX4L71m7RzT6bD94wpbSiyr2PY9u7j99proQXXGoM4lFpYsCjicrcj9atQ5+ c+YbeB9DrFsdWD0fzdR08IPGYVnROi2/Cnb8f/wo34tKwzfOLaWY9WJN3vVOjCOZMfeB99 r9mFGjD+O0EGFFtECoC3lfPYdiClxFhS1pkA9iUkJcNRORAJk7AlSWkdk3DPotpP1w49wj Z9mfub1BJn8qcVJDB1OJ48stpWc+TtYJCGeGVWbRlusC4/68m0qmfr07amiD1Q== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935313; b=GeKwoiOC5Jr9byWFJlyFyhPE2r4darW94/kdNdkMrzn1gb3NobvdsA3l2hZt7oahxuSrHx aVllLJFVntAK9QkPoLzzNso1C2aZG+ZZTtqcgzQwiH2Vr4hRjERl7ba9ksxM44LfqBpg5V nO6TgdsfE/CIvolKiTl9wCesEOyMEqMu+/eWW0MtWgYSw6e++Hgm9ZBQLHMYq1/YMSG5s1 w1V8xYhnYV5n3f+fbfljW8HgJCp/7huUMICnuXkTN6YsAKeRrI+8mVPReVbhHpYG39PZj3 sEnv7RVCj873sp6QsMgxiykA8+OvRXKNoG8RUJtU/kolEsgAOCGq3PMofkEPiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935313; 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=aFC3A7HLoHPD+0XYcnaTC/ENhAz7ZEP0OxbvpUqrH7w=; b=in4nuHz1lb5x58E6AG5/3H8A1Hbp+Z6DIXI1NbAjSu8zcWcJzB3GCGeSS9QUKQrcrgAphl 4yeQDX8NHtnPw9BrJsDPopPfbNH1ZeJc+q09FWRuZUdeqtz/HT+NFEbRSAX9wBgFw+CkLm S/PaqeQPObQFK4LXuntrHmJWVmHP30v03NwA6giZDVZ/CkLjCSgm06IIWEZ9AYFYEgI401 EXEIijkp5gESgZtstoRI5osXncC2TvJne2YnisxM4PLB1T0XrM7uYDlknPtNLv4f9DErIm 1XqpqPxpSqPiTQ2PEKGEp+6PZPGMlAE9E06+LD6HgzSUS+c2hDBWofdQ/dlRLg== 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 4jTWQn4jYtzrqC for ; Tue, 17 Nov 2026 17:08:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 83b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:08:33 +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: b23293b48011 - releng/15.1 - 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.1 X-Git-Reftype: branch X-Git-Commit: b23293b480112dc149d290728ee990bc591f5309 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:08:33 +0000 Message-Id: <6afc8a11.83b.6c6ec318@gitrepo.freebsd.org> The branch releng/15.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b23293b480112dc149d290728ee990bc591f5309 commit b23293b480112dc149d290728ee990bc591f5309 Author: Konstantin Belousov AuthorDate: 2026-11-12 19:29:20 +0000 Commit: Mark Johnston CommitDate: 2026-11-16 21:25:06 +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 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); }