From nobody Tue Jun 30 17:20:12 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 4gqVJs5FtYz6jXnm for ; Tue, 30 Jun 2026 17:20:13 +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 4gqVJs1T8Fz3q2k for ; Tue, 30 Jun 2026 17:20:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782840013; 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=zaKUqlECE+EEcQ6A75NnNeS0OV/M7Qk6EreQcknwr5c=; b=o9d4BcCLNgqKVjzzX1OmcbuomXqfRsmaVlRGHhuXlISw1kmnFWNMmUA6E4E31Prc06g/N+ +8rdvQPts8HHzgAMB+TzP1woO8LkFtFVb2HxOPFawzQXKFh2m5pNCh5EGk7APnMWKTDaMs 7+O+jm3EWHvDuAhc2u6KG3ouYJI5Q6IRjbijE2dT1k4NKQQfNoV5XDrSzaFwiH5DgzsIp7 i0uCg/i8dxcYTtVmO/IfLaVA5z/7ORuIg7pQZZlh/nDelbKPDk6puP+T130nTGDLv5g9zu 3J6AWqM1oLgecPBf5x7SMhzLkSrxYSCvDLEbf/nkWx5Dn6wJU8dcyOvDpyAfdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782840013; a=rsa-sha256; cv=none; b=cepEAl3JdxmWk9GH7W2CR4S/QPBkeyGdnE6O5qJDQwBNbbdo6UP0z8YNiJUuGplPMCoidP EEJyqfgQYkifQg/P1r24oSFnFYtDH6f+jlbHOAa/HUpYt/1s1GZMiDILXZ/WAdjr34m8Nd 1qLBucoox1I7dF31Dw6em7Nhr6fVrxcjY1Of+RZ7upra2srcZBzC56D8zO1C95YdSfFF6J QarMj14Yzv0tmUNKDDpAH1ri1AQqHWHYeb2/t7/BqSFfYx9k50GNvWnTjwGBxLRLUvZRnC AkWD2s3HBtrqB3AOU9zsVii4I59ZkpH6l8dhw8E1O+mYR5lW1AtWhpR3LfX9OQ== 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=1782840013; 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=zaKUqlECE+EEcQ6A75NnNeS0OV/M7Qk6EreQcknwr5c=; b=NizCTiPlacJMkRK4jQ99abnfUKV2FsBYeEjLMIosoZ6z3GUBUfpFhtV7ySyrZoCIKvYXJu 3P5ECcej1EEhYTrq9lIXVR61eaB0suSknobMGwc2moZ7YnqYg9brE0jLuI0TQqZveJH3zf fkS2jWjmCBNoDNc3huYvzuBHXfVPpgEAXyn7n3micaTB01fg9uxRO2kCL4sTFikAAiui3v JZgd3Ry0wd17L8BBVFZmQ1Dv6qjW5nOzab97udJytARQbZ3poCYx+cmqo+75AjNu2VBPqN ajpW5jCZuq/n1TfsZqusJe3xNLVnArlp0nFjOfDo8ApkaocTus5l+OZJAuUNQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gqVJr5ys1zt9r for ; Tue, 30 Jun 2026 17:20:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 444e0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Jun 2026 17:20:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 57e705434b34 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 57e705434b346d91e845ef5e2e35a2502624cbba Auto-Submitted: auto-generated Date: Tue, 30 Jun 2026 17:20:12 +0000 Message-Id: <6a43facc.444e0.d5ce505@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=57e705434b346d91e845ef5e2e35a2502624cbba commit 57e705434b346d91e845ef5e2e35a2502624cbba Author: Mark Johnston AuthorDate: 2026-06-24 19:56:07 +0000 Commit: Mark Johnston CommitDate: 2026-06-30 17:00:27 +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 197409d97f0c..d965576ecd9c 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 fe6386c6aa4b..6729c33a789d 100644 --- a/tests/sys/posixshm/posixshm_test.c +++ b/tests/sys/posixshm/posixshm_test.c @@ -1369,6 +1369,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) { @@ -2165,6 +2186,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);