From nobody Tue Nov 17 17:06:16 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 4jTWN86CMpz71RvJ for ; Tue, 17 Nov 2026 17:06:16 +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 4jTWN8393Tz4Jjf for ; Tue, 17 Nov 2026 17:06:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935176; 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=R9Gb1YWgbv6VYsYw7BnoRvw+4SDJG5wy+dPO/HROTY8=; b=q185sTjL3ynBdTwaPPpECzyI6s2Txfu9oN86Oi4I5Nyus+73dKuTHkAYM6o8Qhxf0Z7PZg gBfYSnM/L6fqAhYvfEEdCKYLE3QKiec5UsYlxB/jD7/y2BQbO923bu8F3pZgMiR2ThwB9b dRNyzYNmVW5BuCgFC8epQclyFInbCeW4RE+gZiZesFBCNIk+Q0YIG/rkP9TKwvLRErKcKe njL3iGZOqUzS0wuJszcQPx1vKF0W+5fVHvHcWBxp4RSxTJTFfmcuCio873mz6AqTSDOqTK MYIuMSb1Jc0+Y1t2HVisCPJCkDVeO/HdDNbC0gXBhC4B55UXE5PZ5WcxuLAqDA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935176; b=dt2ZSauo2DQ891AGACARGPSvjXfwHXtiJwnlEqqt3Qjqdr/uExviudm8Iq3gYK8DfGtKPi 1WFv35a+UG20tlkNeuMTEllEQdOz3oPfrluUck7L2Bs4zEKXr22uxHXNZfw2U2QfchqWWf gOJs/UwhH2+nfSFvluL67HKV2po4NNiXFwPiBSx2RQ+rtOsA7e1/WP8BmKB6962fyk7KQb qCcQO3mbqfU8s8/AMVfm/fhLZt6kQYGoadHewQG83COHXY0neH7ERmuW3zRl13J19Ilfkp vmp+w8DiN1zwwAY1Z3/ndj699B3x7AgdqaVwdNjSf4hRYYty4TmfmjShAIXbBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935176; 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=R9Gb1YWgbv6VYsYw7BnoRvw+4SDJG5wy+dPO/HROTY8=; b=KU0eL0MRmXmOkS8uiqklYfqMb+XKuYPAqdY9JNwV0Q4wDVkU5/34oWd1HftQZ84iCr0kxq jXT+qfRo760okU9FEwllHy+4J4CRwGLjzsCC/qD+Gnpc2EsNvn0uLXhjZHpqRGgZ26UP08 JCQNz5bosmJWYsjMLg1HyKzNMsniuXBMb4AMGpu8Q9Qfw+ZZKtqpyLj/rv0iXs93iAr5uJ Qo0ZjcDz9Lyjd/Abd8nTMaDmXY9C868aQfNmSPr0ohoMx/mEZ3vHhLEqkBfxRzxNcPj+Gc 8/X+xQSkIX46tJSd3UnZGG4gQok5SdK4x9l2kQT9oYj+FJsG1jX5ftA5dWgbJA== 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 4jTWN82VJmzr9N for ; Tue, 17 Nov 2026 17:06:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e521 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:06:16 +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: 9d7c65d1c79f - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 9d7c65d1c79f636037f74030ed01d65c11f8b225 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:06:16 +0000 Message-Id: <6afc8988.1e521.201b900a@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9d7c65d1c79f636037f74030ed01d65c11f8b225 commit 9d7c65d1c79f636037f74030ed01d65c11f8b225 Author: Konstantin Belousov AuthorDate: 2026-11-12 19:29:20 +0000 Commit: Mark Johnston CommitDate: 2026-11-17 16:57: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 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); }