From nobody Tue Jun 30 17:21:01 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 4gqVKp3nSQz6jYK3 for ; Tue, 30 Jun 2026 17:21:02 +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 4gqVKp0W7dz3r9b for ; Tue, 30 Jun 2026 17:21:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782840062; 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=ABUAD07zjWQRpK3PcJ422n0zl09NGrCnKHhyrDDrPOc=; b=J72ZjUaRr9yVHh9iYrlWI5dzbBh6WVJw0ThXI7f/wzNf18+8IgqNuIJ4+NtJRBC7mhYF3Z bFaYcBWbQmB7H0/PrSHjcKR7b0cy/424zkD8QsKznNJ1opk3eSYrBd0WjDNBPw1lcxr76E wrsr5yYWXl7ueuSaJZ7TiyOId1RqsSRPtTe++58ka6QxLdRuTCX2EIkBs+ZQy5UPXXdHrY WWIEHvOoC7reSJ56kTtu7TYO42UdnX2fe14ekJo2kTLWJH4COjc+OECSW5MxMKHHV+A5R2 2kH+ytpnos2s6lqyhSFTv4LbPq2i3zv1/qKb90E00uVZHJockQJ3zbgnsFYd3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782840062; a=rsa-sha256; cv=none; b=ZZrvyNdqURjPR8cfqvsGWuFAMrLZ92WmZ7Xt9SCp/vJCHO6Ztu2jVJGlF20Fhs0QfIXhrb WlWGq6Q7QjCr3sYopQzA+S6UQiunTReAIHAIdFWQA/8cpYQs3tbl92Ug+R+nOAiCFpg4rX MnRkucAQBE+6ffiePVE6VDO8QwuEAUty/Y5dV1GKgv1crgnA6YNTY4/p2ZTqxTuzGJDIKx cM0vVnzLCpwJGmKkMwBMRJKj9+EvC2iFakQzhGMS6/62BovYf+lrIiVFd+XZwt2Tyv86pj atp9Jzd97QwfX+gnjykTQf3Rs3x1fzon22df/orcZqQ5io8TT8k+b8DtTqunYQ== 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=1782840062; 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=ABUAD07zjWQRpK3PcJ422n0zl09NGrCnKHhyrDDrPOc=; b=fCJ38yPTqwPzX2SVqFUwjffoJ/fPnMNfng/15YyLihIVm++voIfyU9tV0aMOdmZ2yJZsu8 xyXhGI/44AmMGa+DfcQ3Shzh0bPdxviOuVwjlfSRRpWDMrm6nK+wvuvlCTm6HbvLnqEaVg GNvKIB1FfyxImBqRDVvL1CS3ZEWFvWwc8P/zfZ4nsWMf622xchB3u6ayybq3fX9H2qopkw Z2xWMAmwwt6twkYnd9RjHmKu2KJ7tWHI8zD74erle22h67G2NOZcRrllogj+qD0L0liOmD x+nb/WF/63PcI1qGoy17ZBYzhlbQThmbZkrfxOjoe+HNpBwMB7MWk50MRz/Kmw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gqVKn6jNFzt01 for ; Tue, 30 Jun 2026 17:21:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4475c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Jun 2026 17:21:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 1c49551def57 - releng/14.4 - posixshm: Disallow fspacectl() on 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/14.4 X-Git-Reftype: branch X-Git-Commit: 1c49551def57bb91348bcf737e6388d018d76eb7 Auto-Submitted: auto-generated Date: Tue, 30 Jun 2026 17:21:01 +0000 Message-Id: <6a43fafd.4475c.1f02c2b9@gitrepo.freebsd.org> The branch releng/14.4 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1c49551def57bb91348bcf737e6388d018d76eb7 commit 1c49551def57bb91348bcf737e6388d018d76eb7 Author: Mark Johnston AuthorDate: 2026-06-24 19:56:07 +0000 Commit: Mark Johnston CommitDate: 2026-06-29 19:17:30 +0000 posixshm: Disallow fspacectl() on largepage objects As with truncation, the operation isn't supported, but nothing prevented it. 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/D57830 --- sys/kern/uipc_shm.c | 5 ++++- tests/sys/posixshm/posixshm_test.c | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index a07dd097f7b8..1c63c8bd3f1b 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -2096,11 +2096,14 @@ shm_fspacectl(struct file *fp, int cmd, off_t *offset, off_t *length, int flags, ("shm_fspacectl: non-zero flags")); KASSERT(*offset >= 0 && *length > 0 && *length <= OFF_MAX - *offset, ("shm_fspacectl: offset/length overflow or underflow")); - error = EINVAL; + shmfd = fp->f_data; off = *offset; len = *length; + if (shm_largepage(shmfd)) + return (ENOTSUP); + rl_cookie = shm_rangelock_wlock(shmfd, off, off + len); switch (cmd) { case SPACECTL_DEALLOC: diff --git a/tests/sys/posixshm/posixshm_test.c b/tests/sys/posixshm/posixshm_test.c index 314bf5e3ff5b..dfcb5a72fefb 100644 --- a/tests/sys/posixshm/posixshm_test.c +++ b/tests/sys/posixshm/posixshm_test.c @@ -1380,6 +1380,27 @@ ATF_TC_BODY(largepage_config, tc) ATF_REQUIRE(close(fd) == 0); } +ATF_TC_WITHOUT_HEAD(largepage_fspacectl); +ATF_TC_BODY(largepage_fspacectl, tc) +{ + struct spacectl_range range; + size_t ps[MAXPAGESIZES]; + int fd, pscnt; + + pscnt = pagesizes(ps); + + for (int i = 1; i < pscnt; i++) { + fd = shm_open_large(i, SHM_LARGEPAGE_ALLOC_DEFAULT, ps[i]); + + range.r_offset = 0; + range.r_len = ps[i]; + ATF_REQUIRE_ERRNO(ENOTSUP, + fspacectl(fd, SPACECTL_DEALLOC, &range, 0, &range) == -1); + + ATF_REQUIRE(close(fd) == 0); + } +} + ATF_TC_WITHOUT_HEAD(largepage_mmap); ATF_TC_BODY(largepage_mmap, tc) { @@ -2168,6 +2189,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, mmap_prot); ATF_TP_ADD_TC(tp, largepage_basic); ATF_TP_ADD_TC(tp, largepage_config); + ATF_TP_ADD_TC(tp, largepage_fspacectl); ATF_TP_ADD_TC(tp, largepage_mmap); ATF_TP_ADD_TC(tp, largepage_munmap); ATF_TP_ADD_TC(tp, largepage_madvise);