From nobody Fri Nov 13 10:07:03 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 4jQtGJ0jzfz70PfB for ; Fri, 13 Nov 2026 10:07:04 +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 4jQtGJ0G5Tz50Gy for ; Fri, 13 Nov 2026 10:07:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794564424; 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=LVXE5Nh/1viKGdFxkOGoxPOu6sDbi29zBd5DoDiAKTQ=; b=SR7Rt4L0RejjVbqGHQWl+4P/uhk99MOyeiNcEQGSuZBgJIZ4uUAHyf1YAMKXl3kCS4ucNm oOG3Z6GaOz3XHZvlUsF3ghjiEiUPSO+VkOhuZgXQT3QSNAH06jlWNRV5gqdnQvQpyynXb8 O1lH6Wjv8srPbbcp6+UGQa3QsEPrFoiKREnPeptiflc65DlOtXVG88MEsK+U01HA8Ueik1 PuABe3X/Wb6A2n2m1NEz+PPDwzze1YRABFjzk4SfbsfYc4GyZAu5epcfNQSBA8sCPY06Sh VB8F0D+J642gaWOhxRGD3ZbtYqp+3zENLTf+UFOhiu5BxDdetqtBButOFqyvFw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794564424; b=bBdnPLKuJT52H5eGRR8+9qXLtuD8KqG+nHq0Zo6iBYCM6sSnoXS87+01YJYMOd3dcaX65g EeagMTbeLgBl/l46+r75UhSq4M120D48Ip3p+CAGtcv224CyKd87Z9q0eyYhXVHrmUQ9OI iJwmWb3zQX8QpiE7BNyeZ9La7igYQ2GfxzmFpfJOCsnAKriZdhRNZg8qOxh03ApuXOo/Xl bKGg2YBdm35l/AWBzAQ6mutaDZhsQDmgu5+4M6xYB/p7Rcff8ajy9Bil08UwkQ4KFfSwRp fzASuHgtWQCFmZsYA7XHkNRYJjasv0cmcs9RNhNzjOVKuZlANxImrvVnzh1rnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794564424; 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=LVXE5Nh/1viKGdFxkOGoxPOu6sDbi29zBd5DoDiAKTQ=; b=hnn2s+K+jZ19MhQgJbL0S/okC5qUehGhPDxkBaoV2+JSlUW0604iVOgkfTyDputwFayzHt jMTW6GTguiFgjYIcfzKrrcl4d3YseLblEeac5dIkJpl3rU606Qdt0TkpnqF1P7jsWsbRIl jWITV8pPf2tG9leQo1HQOyapL/K6H7Sh90UtwS9nHhGG05SSGjBhp9ej0jOdM1xoyvBuKT qw9mj8cx21YUNlqaq3yB5uex4Dji8JaRQ6BEpT8BB+btZrfgSKtRCAHK5MmjDhcqiNONHY fPG5Cf1lcouuilR4uijwjKRtaIQVWfxAuIXVBPzbHLtno4MdvPuu7k6MqAFCmQ== 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 4jQtGH71yHzScZ for ; Fri, 13 Nov 2026 10:07:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8dfe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Nov 2026 10:07:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: ef726c645300 - main - 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef726c645300870b6bdf3573079b1f89f3b45c74 Auto-Submitted: auto-generated Date: Fri, 13 Nov 2026 10:07:03 +0000 Message-Id: <6af6e147.8dfe.4f664699@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=ef726c645300870b6bdf3573079b1f89f3b45c74 commit ef726c645300870b6bdf3573079b1f89f3b45c74 Author: Brooks Davis AuthorDate: 2026-11-13 10:06:52 +0000 Commit: Brooks Davis CommitDate: 2026-11-13 10:06:52 +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. 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 --- 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)