From nobody Tue Jun 30 17:19:53 2026 X-Original-To: dev-commits-src-branches@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 4gqVJV331vz6jXb7 for ; Tue, 30 Jun 2026 17:19:54 +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 4gqVJT6yFyz3pjv for ; Tue, 30 Jun 2026 17:19:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782839994; 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=lWRuNPnsBiH0bdyt2Op7UZQwmTet/TcvLMZTK6u/N1M=; b=SKk2/ZtQZnYALN4mi7BKQnODNV67V2wKdEXiOp3WrOu561udJboKn7i6GLAKKEJ5dcusky Gkd2E84soRLwCUxi3Fav/K+vbBjAv0sG3RrVP/JpBWN1Uz+d101nOnOWnIBoqg3DNUOEYq QsHwCilycwhwoMH9H/bJ74ZceqOPG8wXq3dc8acwyvwqQHD3NVeJzpBwW+P1dP5QHHfNN2 qQ98XY3n3wI5ZmsDRFYDJww1j7ifZAt9mEqEt5oqNrHYp8MGE/KyHqGLt0lOR/nxP4y9B5 jyKm58jhol+EJk0G8+DHyKOebMYDNOSNM3HG1Kiae7hXgmYsbj/dKDzbtPnt5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782839994; a=rsa-sha256; cv=none; b=k3ekSwATPLAzYaG6p2Nqlmb+5zCGbvIdb0EC2mBJTWbRx+LXGCR2B7Ih3lwXaHCOG4odEt MzjOyB+oi9VarT86hnttMaDA+VP2tzPwT5em4bybgSHyMJsmIrUCnuQeGXJ3WDTc2Hqxkk o0UkSpLCu5KD4xo77GBaU7nSmkB2yIm5hSLhaBapQ1FrElI/MTaRNeKdGDqKnUdx13mSA1 5RKCLZQqfBo8h/y3ZWrQDa9NA0kp///4FvvsqkG/EOdHqDNbv2TNI4gYiMqSlwKvTSv9CT QmG0jRnPF7BUNIXfxQEi+krml0UFKgCWsI1CIJCvnTgbBVeaXd709ptZf6IvSA== 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=1782839994; 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=lWRuNPnsBiH0bdyt2Op7UZQwmTet/TcvLMZTK6u/N1M=; b=t06jLMrejESMYvdP3gU5Qdra1c8fl728sV44u9VoMBnRL9CyeApma21yajJDISC0euHisf QTXWwtmLHWgIDXZPCNEmfjFKenoeimUgsw8WvbCOGwYqhAiL/EjlboiR6IwxDIWKzEJe+8 ogc5uH03qTvpiYtWWrpuRRbF9BcJUi0rJ57XKjn5dMgMTGaG+Q4KT9qyuOCkWxiac1E3nH ipfsfdE56YOn2AVI6T4kDhd9jQPLcT6GZyrizjWvfBr2JoGGZe9TiNQSab74y2sHeCS51b i726mJBMuJPP8e74ggcdqzWapu2o9UKlF1nXXIBaPLN+vUqghV44iXpnY48d8A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gqVJT5cz5zsXZ for ; Tue, 30 Jun 2026 17:19:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41dff by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Jun 2026 17:19:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: c379639aa4c1 - stable/14 - posixshm: Disallow fspacectl() on largepage objects List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: c379639aa4c1612c83c518d173a507618b9bcf17 Auto-Submitted: auto-generated Date: Tue, 30 Jun 2026 17:19:53 +0000 Message-Id: <6a43fab9.41dff.257f63f4@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c379639aa4c1612c83c518d173a507618b9bcf17 commit c379639aa4c1612c83c518d173a507618b9bcf17 Author: Mark Johnston AuthorDate: 2026-06-24 19:56:07 +0000 Commit: Mark Johnston CommitDate: 2026-06-30 17:00:22 +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 cd79d2039ebf..5c6a8d6e25ec 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -2104,11 +2104,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 85cb8af54039..d10d304ea5b6 100644 --- a/tests/sys/posixshm/posixshm_test.c +++ b/tests/sys/posixshm/posixshm_test.c @@ -1370,6 +1370,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, true); + + 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) { @@ -2166,6 +2187,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);