From nobody Tue Jun 30 17:21:30 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 4gqVLM0Xf2z6jYhL for ; Tue, 30 Jun 2026 17:21:31 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gqVLL4Xvpz3rpB for ; Tue, 30 Jun 2026 17:21:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782840090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bPxA0XWKmRK0yWPtlTGCd5BCNGWXp8HynSVadpRD2uo=; b=b605xxc8cv2b6xSkAgJupW9YZbggQUc6Bbrc1GF0vMFWwyvcwuE9+lHN+75dPcet/NsV4b bAqjTfCkavOtF4BROsKOtcp0kq3uwbE3CklPTf1bz9pLdOISSyCPnMqXnyRLj4mye6dfs7 23w80YREG/l9BqkhVdC+IIx6BYiy23JBJ7MKYgb+rfSoHYY78FA791/h9+Pv5GHNGTucnu etb90KXRXTrZrDpP1fZ6EkwsEGfAN0mnYqjYumjiEnFAD/OaHfIIh6QoGG+q4ozLj/vIv7 2TxEtZdTbCm0VEShEce6gHT92NYBUGiHp5uAH4AL/MoDo2Ffg2lGjAjzo94BdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782840090; a=rsa-sha256; cv=none; b=VM4mpQrf3MHksAap3JiIPoeALhDywaKWirp0CPdEB/7CJNL1tHWCFHXgKra0Jnuh5JP9FN OGESJH/LE6lFbuaCECYDhWnRchMCoAhOhUeiNIMo+ozQuL7HsdH31HZ0Y/guOovJP6NJYj 1evhzr0g9MGA78CrTXakjSCG0n0SnkCuW2go78A274TIpRDZJXOPkXw72nTB5Rn7nPF3bs GFTNuRWuRX2XZv+kUjohgvTTcnkNPcz3EMBP+/WJGYALLQd4dRou5owwpKmSSL7yEyeHGz QVzHENcBmoUswbza+04txu6tdHre0yBq9g+BP6jQmokWxsQXTlRyj0KUFzgt1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782840090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bPxA0XWKmRK0yWPtlTGCd5BCNGWXp8HynSVadpRD2uo=; b=qsvONstaM3ieul21B3C1XE4WcHE6sOuJmmetPaN8cZSjMqcYkPChgHz+GzXv7JKMNl+Qxp ceO7K39qgdKNNQCzUYW2/+cJJxBhzDTfQx3anKaRqR/dVE5QU3wA/K+rhh2Lomc2N7r5Lw 9ifeJxz9RB0xUoEWx4NnfDNk6OEP0IMr1G3Ebi8QzynN4xdmK5ZoHPKX4kqrahKrVbY7/3 yijHZFwBp5ylUhrQkUbe5vKotUMCTxkGd/R6dM2UIgM53E1KbzpeDp264J6NUy/pXcIXij aPaGGuWAqWEmN2CEFv91HhJI2m7cpWH63NlFweNQ6jSdVJonR0NSgGrxL/xc6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gqVLL3LLRztQ1 for ; Tue, 30 Jun 2026 17:21:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44f6c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Jun 2026 17:21:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 47728575b40b - releng/15.0 - posixshm: Disallow truncation of largepage objects List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: 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.0 X-Git-Reftype: branch X-Git-Commit: 47728575b40b09cf4f3b45f1fc9e89e1db8ead59 Auto-Submitted: auto-generated Date: Tue, 30 Jun 2026 17:21:30 +0000 Message-Id: <6a43fb1a.44f6c.3648fc70@gitrepo.freebsd.org> The branch releng/15.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=47728575b40b09cf4f3b45f1fc9e89e1db8ead59 commit 47728575b40b09cf4f3b45f1fc9e89e1db8ead59 Author: Mark Johnston AuthorDate: 2026-06-23 22:47:02 +0000 Commit: Mark Johnston CommitDate: 2026-06-30 02:32:57 +0000 posixshm: Disallow truncation of largepage objects We correctly handled ftruncate(), but not open(O_TRUNC). Add a regression test. Approved by: so Security: FreeBSD-SA-26:44.posixshm Security: CVE-2026-49428 Reported by: Chris Jarrett-Davies Reviewed by: kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57831 --- sys/kern/uipc_shm.c | 8 +++----- tests/sys/posixshm/posixshm_test.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index 136bb03246f8..8ab03b5bff32 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -788,7 +788,7 @@ shm_dotruncate_largepage(struct shmfd *shmfd, off_t length, void *rl_cookie) vm_pindex_t oldobjsz __unused; int aflags, error, i, psind, try; - KASSERT(length >= 0, ("shm_dotruncate: length < 0")); + KASSERT(length >= 0, ("shm_dotruncate_largepage: length < 0")); object = shmfd->shm_object; VM_OBJECT_ASSERT_WLOCKED(object); rangelock_cookie_assert(rl_cookie, RA_WLOCKED); @@ -1328,15 +1328,13 @@ kern_shm_open2(struct thread *td, const char *userpath, int flags, mode_t mode, if (error == 0 && (flags & (O_ACCMODE | O_TRUNC)) == (O_RDWR | O_TRUNC)) { - VM_OBJECT_WLOCK(shmfd->shm_object); #ifdef MAC error = mac_posixshm_check_truncate( - td->td_ucred, fp->f_cred, shmfd); + td->td_ucred, fp->f_cred, shmfd); if (error == 0) #endif - error = shm_dotruncate_locked(shmfd, 0, + error = shm_dotruncate_cookie(shmfd, 0, rl_cookie); - VM_OBJECT_WUNLOCK(shmfd->shm_object); } if (error == 0) { /* diff --git a/tests/sys/posixshm/posixshm_test.c b/tests/sys/posixshm/posixshm_test.c index d53e8f57b89e..fbd15f079896 100644 --- a/tests/sys/posixshm/posixshm_test.c +++ b/tests/sys/posixshm/posixshm_test.c @@ -2150,6 +2150,43 @@ ATF_TC_BODY(largepage_reopen, tc) "close failed; errno=%d", errno); } +ATF_TC_WITHOUT_HEAD(largepage_truncate); +ATF_TC_BODY(largepage_truncate, tc) +{ + size_t ps[MAXPAGESIZES]; + int fd, psind; + + (void)pagesizes(ps); + psind = 1; + + gen_test_path(); + fd = shm_create_largepage(test_path, O_CREAT | O_RDWR, psind, + SHM_LARGEPAGE_ALLOC_DEFAULT, 0600); + if (fd < 0 && errno == ENOTTY) + atf_tc_skip("no large page support"); + ATF_REQUIRE_MSG(fd >= 0, "shm_create_largepage failed; error=%d", errno); + + ATF_REQUIRE_MSG(ftruncate(fd, ps[psind]) == 0, + "ftruncate failed; error=%d", errno); + + ATF_REQUIRE_MSG(close(fd) == 0, "close failed; error=%d", errno); + + fd = shm_open(test_path, O_RDWR | O_TRUNC, 0); + ATF_REQUIRE_MSG(fd == -1, "shm_open(O_TRUNC) should have failed"); + ATF_REQUIRE_ERRNO(ENOTSUP, fd == -1); + + fd = shm_open(test_path, O_RDWR, 0); + ATF_REQUIRE_MSG(fd >= 0, "shm_open failed; error=%d", errno); + + ATF_REQUIRE_MSG(ftruncate(fd, ps[psind]) == 0, + "ftruncate to same size failed; error=%d", errno); + + ATF_REQUIRE_MSG(shm_unlink(test_path) == 0, + "shm_unlink failed; errno=%d", errno); + ATF_REQUIRE_MSG(close(fd) == 0, + "close failed; errno=%d", errno); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, remap_object); @@ -2201,6 +2238,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, largepage_pkru); #endif ATF_TP_ADD_TC(tp, largepage_reopen); + ATF_TP_ADD_TC(tp, largepage_truncate); return (atf_no_error()); }