From nobody Tue Nov 17 19:51:58 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 4jTb3M0cK2z71lBZ for ; Tue, 17 Nov 2026 19:51:59 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jTb3L5v4fz3GlB for ; Tue, 17 Nov 2026 19:51:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794945118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pa5U7b89rtxk6YePa449ZzGfg7Fq9cCl2SlnDXc8hV4=; b=cfT6WUUMSrhsTVrxp5bKcRYtqwkpDa7ZkXgGyZb8RFrBMi9JLKXXaBJh34YjZhgHEkFuJK uL4g+WUippD8/gLOVESkWuu4Gb7JAyRLFWwq/vyJkIhsz7j2PHvVhbfucP3n+yns+9ggJl Gm0UnTfsQjN59U6IVq+UUwIQ1OJoUGpua5wZ5tWZLDeKdSAV74gvQZtRWDF6M4tMK3rsBX j7Uc677OzTcD8QAjNXAjwXTVAUrS+Z+GPcps7fuAQODBTxJ+r/dwyTNbSnzWi+Oq+ib0wN dBBA+s+MdtVSU5zVqIz8QKDCd1mHm+BFoWkjjgrtZjoz2inzmRzIXoMqx8FSNA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794945118; b=cNa8lWkv0VZgO+iEwgWgDbhykvpu6xpFooUsiFKvRmwE5pTN7I4cJJdEHtscEBYbi8R7xf 4vNVGrnmvkpYxo4qe5fglNk0peJQxgcvhqTN8NNBiReihEa7qIAZGQv84vgp5KlIGocRFP b2p3HgjJLIXKJazU4qR8vK+i/PLC87Cppemqz3N1OztElYb6oW/y3YiNfqOkY3PexDGLs1 OX0m3GEnPvtPkxt5UrFRzq+K5CIX4vUYQx3BJScytr6U5TpAnOvwICIKk1dvDdQM9nt1bz NP7Ks3C5da58XUaR91nr+sYy3uOXnyfIsbs6kYgp45xZtbgGcaf7NmgLvo6iGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794945118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pa5U7b89rtxk6YePa449ZzGfg7Fq9cCl2SlnDXc8hV4=; b=i2unOUbQJC/iLxyeK4CA+8zjbYMbf+a9pMRysSdqKDh2hIUVVTwh8Rsy3C8dbLQPyi8z+U JDtn9zLUiX+6bevL50orL+y2BZui6r2Mwr00qItximeP8k+clKXAvnestCVi6An7UaVGHc WH4a2W61DHn63IzPg9CYCsmxb4bSs+898wRMauffvawZgZ491PXdrbe9pSZuYWhNTd0bgc RgtsgJiT3fLXz+Aym7qX3bSfTaUy67RqgbdZhA92b0ST8/3SLMdMiq+X9MwDfNTr42kWbd wfaED3vfxH91/I1jtW5SxggNxKb4cFack7Jz0BbvCDpWW4kmA7cYSlYS/vWPdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jTb3L5Q0yzx2D for ; Tue, 17 Nov 2026 19:51:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 11ba2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 19:51:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Brooks Davis From: Colin Percival Subject: git: 76757177c30b - releng/15.2 - modstat: allow compat support to fail in tests List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.2 X-Git-Reftype: branch X-Git-Commit: 76757177c30beb42a055650ddda076773c63a167 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 19:51:58 +0000 Message-Id: <6afcb05e.11ba2.925354f@gitrepo.freebsd.org> The branch releng/15.2 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=76757177c30beb42a055650ddda076773c63a167 commit 76757177c30beb42a055650ddda076773c63a167 Author: Brooks Davis AuthorDate: 2026-11-13 10:06:52 +0000 Commit: Colin Percival CommitDate: 2026-11-17 19:51:31 +0000 modstat: allow compat support to fail in tests v1 and v2 versions of stuct module_stat are now gated by COMPAT_ ifdefs so allow the otherwise valid query to fail with EINVAL. Approved by: re (cperciva) Effort: CHERI upstreaming Reviewed by: markj Reported by: llm-postcr Sponsored by: Innovate UK Fixes: 1ebf46ecb627 ("modstat: don't copyout while holding a lock") Differential Revision: https://reviews.freebsd.org/D61460 (cherry picked from commit ef726c645300870b6bdf3573079b1f89f3b45c74) (cherry picked from commit 4a9770b9256c7119da287b15a6e7900298e6d514) --- tests/sys/kern/module_test.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/tests/sys/kern/module_test.c b/tests/sys/kern/module_test.c index 37cbc3b3271a..b4f66ec9c953 100644 --- a/tests/sys/kern/module_test.c +++ b/tests/sys/kern/module_test.c @@ -30,6 +30,7 @@ #include #include #include +#include #include ATF_TC_WITHOUT_HEAD(modfind); @@ -144,11 +145,14 @@ ATF_TC_BODY(modstat_v1, tc) ATF_REQUIRE(modstat(modid, (struct module_stat *)&ms) == -1); ATF_REQUIRE(errno == EINVAL); + /* Kernels only support module_stat_v1 when compiled with COMPAT_43 */ ms.version = sizeof(ms); - ATF_REQUIRE(modstat(modid, (struct module_stat *)&ms) == 0); - ATF_REQUIRE(ms.id == modid); - if (strnlen(ms.name, sizeof(ms.name)) < sizeof(ms.name)) - ATF_REQUIRE(modfind(ms.name) == modid); + if (modstat(modid, (struct module_stat *)&ms) == 0) { + ATF_REQUIRE(ms.id == modid); + if (strnlen(ms.name, sizeof(ms.name)) < sizeof(ms.name)) + ATF_REQUIRE(modfind(ms.name) == modid); + } else + ATF_REQUIRE(errno == EINVAL); } ATF_TC_WITHOUT_HEAD(modstat_v2); @@ -178,10 +182,14 @@ ATF_TC_BODY(modstat_v2, tc) ATF_REQUIRE(errno == EINVAL); ms.version = sizeof(ms); - ATF_REQUIRE(modstat(modid, (struct module_stat *)&ms) == 0); - ATF_REQUIRE(ms.id == modid); - if (strnlen(ms.name, sizeof(ms.name)) < sizeof(ms.name)) - ATF_REQUIRE(modfind(ms.name) == modid); + if (modstat(modid, (struct module_stat *)&ms) == 0) { + ATF_REQUIRE(ms.id == modid); + if (strnlen(ms.name, sizeof(ms.name)) < sizeof(ms.name)) + ATF_REQUIRE(modfind(ms.name) == modid); + } else { + ATF_REQUIRE(!feature_present("compat_freebsd13")); + ATF_REQUIRE(errno == EINVAL); + } } ATF_TP_ADD_TCS(tp)