From nobody Tue Jun 30 17:19:13 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 4gqVHk00DWz6jXpD for ; Tue, 30 Jun 2026 17:19:14 +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 4gqVHj4h8Dz3nM3 for ; Tue, 30 Jun 2026 17:19:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782839953; 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=QoUQVtaZrXDoeW5z9UM5b78lRJz16jmRn4RYLnzMPnE=; b=jFd+ksoMeJZGxW2TVt4i/XlS10/nxjlEalLAijbyaVhlR/r8JJ/ITyZlGG7ZtOCJdwdH2n NQk3hYHIKvJ4s2+MiT9BdV19iyyHkS7FO1QzA+/eL/JyCAZomqmD8Blccgi3USEKZrEt6Y bYrW2YFRnHdKQiyiGsj2ho8is+0ChpuwZZ9vhNr78xurgBiWBo1wvNFYJ+apSn5GM9G6Sf ZWYNoPYjSeuVdJhx8L8s2RdDxgFfT9Sj6gxMVuL2xY6QxJ/VyrnaQ7zBYEX6L8FAPqm0l/ l9505+jIsH2Mt4weigqCw6EBl0ht6r/jvURsmLccNJKXOuDE8o46BFTCuG5wdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782839953; a=rsa-sha256; cv=none; b=qv5tZWmNeGgIq8uuZfui5AuagkWjzplw5mFrQEz54cC1XMtCwpHMhRdluRJw4VR45b/FCz si/NhGJwZPzM/Fx8+f7UHsVY+l8aOrxwaU9Ds1UqBtqDNTw0nrC5F3ijOT6PNxC17xnQZH RhKMcJXjNbq+OrDL1Vjd3A/CIlJl+GPazQXRwQaC8huVvihaIBPsR7y9oyw10GLvIwRDkH yohta/9zeRRVpXlII/UrD4qeXPS19oQ7GnBtKyCzVH8InnXrXoLUQTV3NtzwDXGPHoaS7g fbRWspd5VVSqF4Rsa2xScrN4idBUJee/qTITZW3qLmJx8h13wjaK9uSVlsxBTA== 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=1782839953; 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=QoUQVtaZrXDoeW5z9UM5b78lRJz16jmRn4RYLnzMPnE=; b=kpop2GZoQGZw0UMIN6CavR7BTRmfcf/3mPYovd5GZMVHAPxZxZXYSDpxV1nusg8R9LFEG5 niNKHwhb8V4p0o037r9SXIoGBQSicEnWvCL39n9FE+sV6vTTl9Bm8sq9UQJ+QKanFlcqTq 77CT9ADKve6X9TPQlefnzSv84ym0jada7vNJMb2fENH4b5f237c1IH6uHdkUmWABVZ2tDU tVkuZlnQG1vagPhmlxjlExPOblbFsKNAa28VkcaYV9DQKylya5MT3T0QJBwETzf8gUfdfn iNSqBjCQ4HunRlTjpcDc3+FEqlFu+w2bvRlYVD5Ya+9cEE0nxEn5KOY379qDeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gqVHj3XLQztD1 for ; Tue, 30 Jun 2026 17:19:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4451a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Jun 2026 17:19:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 1491dec424e7 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 1491dec424e72a2f429d84d11b0d248abc6c6cda Auto-Submitted: auto-generated Date: Tue, 30 Jun 2026 17:19:13 +0000 Message-Id: <6a43fa91.4451a.8e38253@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1491dec424e72a2f429d84d11b0d248abc6c6cda commit 1491dec424e72a2f429d84d11b0d248abc6c6cda Author: Mark Johnston AuthorDate: 2026-06-23 22:47:02 +0000 Commit: Mark Johnston CommitDate: 2026-06-30 17:00:23 +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 d965576ecd9c..b1b6a8657d69 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -786,7 +786,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); @@ -1334,15 +1334,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 6729c33a789d..e816e2d1efa7 100644 --- a/tests/sys/posixshm/posixshm_test.c +++ b/tests/sys/posixshm/posixshm_test.c @@ -2148,6 +2148,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, true); + 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); @@ -2199,6 +2236,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()); }