From nobody Tue Jun 30 17:21:29 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 4gqVLL0Y3tz6jYKp for ; Tue, 30 Jun 2026 17:21:30 +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 4gqVLK4Z12z3s2D for ; Tue, 30 Jun 2026 17:21:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782840089; 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=zIutJ2QKQBLbmQpf8mHkHnC7o83/1b7i9qsbnrXORGI=; b=pUb99rE85HEg5/KkD38icLLTYepds66zOa5oHKqw33FOYUcFv5s1NE5T6FDZ3vOg9lNAD6 k3UbUswpxrHhIVr5r78AjIOFX5OyBUqOfmrr1HuSlLYd/0p7S6iYhC/HHSFiJ68HjoZHXl UCgKXjwJGnIU45pm6o5cqRKohtLiCnin97sK0W0YgNSSWibZ+kCjxPNrFO8lvQMJq65xXy JU0SHI98mdRbnp9LelfdSyfVSl84S8LfPy5NR/kxzkU0rHvhHd/5Lic/kkTPcWzDO5bQbg 7FqCTC0JfD/9RSoQ6ZmhM8n6LqzYuDm1bkCSY+rpHki6te1JsngSumBGFpG7GA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782840089; a=rsa-sha256; cv=none; b=hhqIsYkFP0Z9+KFKt3vME1QnC3f2s5z4vzjj+6hGKHkeLAS0OgOhhQY5LHwcQMjhdofpnB MaYAXe/6wcPcTZyhhfXy/9InznZTef7Y1lx680LOzZLZCeVUBZj0KPKruZ0eSarQo2Q7i1 BM4AWmnjfmh1FJO/SnSckZxO9tMqwgFNoW+jtMyVgWcwz0nPv3OlSw9TytLWx1G7TOGbT8 yuSDRg9cUOV66WKaX7Ia/MsueubLqzqSaa8RKLtGZOPRp7myLbXf/YnNuML5GK+zgRa+3R 8eeDQveWkRA/8oiSHbzo4eC/E6RCe8xoBp0/k6MkcXS6xZDjOh5y5KPZ8CnkOA== 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=1782840089; 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=zIutJ2QKQBLbmQpf8mHkHnC7o83/1b7i9qsbnrXORGI=; b=tKnYSmOJIxMXC8GtwvnBQlvB91t9DrP6HLCr2jM5NB4hyXAWWQGc2lqyoPM1PIKhQVltuZ he5UHr3snRgdaO5e/Qt/yDpy2UoaQl4713t5how1CKwcDMxuPcqHelYU7lpxz7gpayqk1n V6edil2wgvM/r4+VMwL0D94vMfNTjezL/VdEBjS6Wticw9+e5pye4CjuATGzMqlTVjreix hcsGzh5MGEYYpgWIXWt7kWuepIZN9nq+8t2ydJlxlMhYPbdhigByvQScQVWGt209Nbe7Mh qKK4B/LNeRyMMs0tclhGEsnefrbhAXdhlTXuDDIxRI6d7SmnQDK267w6ddlXvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gqVLK2XkGzt0Q for ; Tue, 30 Jun 2026 17:21:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45f6f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Jun 2026 17:21:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 21fe39288f8c - releng/15.0 - 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/15.0 X-Git-Reftype: branch X-Git-Commit: 21fe39288f8cf792a4c2589c99f4a0afe55f47a6 Auto-Submitted: auto-generated Date: Tue, 30 Jun 2026 17:21:29 +0000 Message-Id: <6a43fb19.45f6f.5bbca836@gitrepo.freebsd.org> The branch releng/15.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=21fe39288f8cf792a4c2589c99f4a0afe55f47a6 commit 21fe39288f8cf792a4c2589c99f4a0afe55f47a6 Author: Mark Johnston AuthorDate: 2026-06-24 19:56:07 +0000 Commit: Mark Johnston CommitDate: 2026-06-30 02:32:57 +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 eb1327f7f2de..136bb03246f8 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -2090,11 +2090,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 1250fcb63a93..d53e8f57b89e 100644 --- a/tests/sys/posixshm/posixshm_test.c +++ b/tests/sys/posixshm/posixshm_test.c @@ -1379,6 +1379,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) { @@ -2167,6 +2188,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);