From nobody Tue Jun 30 17:19:54 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 4gqVJW49W2z6jXYW for ; Tue, 30 Jun 2026 17:19:55 +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 4gqVJV6wLkz3ph5 for ; Tue, 30 Jun 2026 17:19:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782839995; 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=FzMO7qetH/ofAqBbwWdF65c3f5sqs80jJ9KDxxlDo/4=; b=Uyr7Cs0F6LGt7OkAWpEmOVV2HzixfZZwbTbi/zI07VaQVEfHPEdN1DhYeP01J8ZSgxqOLF c9jlkcsC14a7xO077J6CKMLtV2YUnvtVwZOllldPLnlqY33NI38JgPyF+WLIoeV5HTmZoE 6a+AsHhRFKvmzyM/Hxgo4SwCjxqKkaHMccYSFJejYGYfu0I9rF4dfsT5a8Q/Qv/LA6SuJY xwqz5SJj7HwXPr0v6ul2jUaXrLorddKqA/gddAsPvRMHJl9q9tHL5pt3J3eSqO0JbaLKjl rjYq+9hgRXVvsTEvQ2hJXyjMPrYa+iYuw1P5f8KkIXnYroAjzuKsvHWE4WJORg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782839995; a=rsa-sha256; cv=none; b=Wd13WB3ILNim2LOTM+kBO2TeydgXweYuP2lbSuGz6P4paCSulbtBBi8XgHm7tV6bd14AyH TNhf/OVhIcssPJZfD/kXLIYKB7+l4Bp5ZEOlvOR2f3yQxFuGY4NxYRB6zv466cT9YfZhyK nu5MZt4UHV211dKh8kozygottgNM8OnHeBptesRoXkqLyDbbOWY5Ur5yTFB4FibvZIWS3e bfzzNdj5OicLGSuN+c6s86Q+gIDYmLLwMNpOiXyK75rIdICAm8ulunDshn45vodzVXlNxH f6TMo3YIQHCwKmN8/SDEMnaQa6sPeSGcilJYoOwrhP+0Jzsq9QJD2VDLzbaJYw== 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=1782839995; 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=FzMO7qetH/ofAqBbwWdF65c3f5sqs80jJ9KDxxlDo/4=; b=TYETLmywOJksG+n34W9OR83OeGdWoj8NzCweQvKPjkrOrjJBTtna3VsGbuVjhGwlNrYsEa H4ag4cBqGKFsjo9H4U7ZT3IBnO322tXXhLKUXl8Q7b5CHsFv1rNd80QMrl8EwX7bEn1jYO 2QIvYxhhryaYZVZmcjW7RMEWeOtiIDIRn3uJvK6roW30GQt9n4MB0FoMoK6NpNRBFdrB8Q 3kc2x+NlTKsTni5d0kDWQ2v7L8pkCV6bhJu5imp1U++temWfwl6j+3/NqiCkXitKUo65Gq /3pqkNYbdW5RydnKBFEY9JRr8HcAFJWsVZfYt/KFJwgZg4xibXavz+l3Upy6rg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gqVJV60gNzt9b for ; Tue, 30 Jun 2026 17:19:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45501 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Jun 2026 17:19:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 65883818cea0 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 65883818cea03738c1a2b7ffc56ab2fe8041e9c1 Auto-Submitted: auto-generated Date: Tue, 30 Jun 2026 17:19:54 +0000 Message-Id: <6a43faba.45501.d64e87e@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=65883818cea03738c1a2b7ffc56ab2fe8041e9c1 commit 65883818cea03738c1a2b7ffc56ab2fe8041e9c1 Author: Mark Johnston AuthorDate: 2026-06-23 22:47:02 +0000 Commit: Mark Johnston CommitDate: 2026-06-30 17:00:22 +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 5c6a8d6e25ec..f302bc305f86 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -824,7 +824,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); @@ -1353,15 +1353,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 d10d304ea5b6..20f44693b45d 100644 --- a/tests/sys/posixshm/posixshm_test.c +++ b/tests/sys/posixshm/posixshm_test.c @@ -2149,6 +2149,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); @@ -2200,6 +2237,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()); }