From nobody Mon Nov 16 10:45:54 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 4jSkzl2N2Gz70354 for ; Mon, 16 Nov 2026 10:45:55 +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 4jSkzk4V7dz4l9M for ; Mon, 16 Nov 2026 10:45:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794825954; 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=bw7Sexp2i4gxNKmtNTIBxsR8rsaARbsqdyJWcUsTjSM=; b=wA4NelMvukqv8Sq71t+I0bc+6d9yJChZJeTRIBxPS53CRV7dFUI3opPC91fh4GLBuGt7/i 0vYsbOaN2OI1e7XxeVpT5UdkB7BZWGoFGuyu9ir3C9Kn1M6VYQFz0hWMhaydoDoAJAGL+u 3NfKLhcuihaCqgnNZ6sKk8ZXbRyBTl2rCJct3eJI6ASyoqmXy/UYmr+WKKqPS2ZTg4YufH snqp9aA7WPUhL46MqzPNmhTiBZY6c3HpPwqYIXmYGEPvCzo7LCqlkbl3T5lPiplCNL4VYz r4vF0Eq0GBcSqXHMDvmlePW4sq4jrgkPNFUuKxAKfoCz7Yeh9+SGtqmVYT9m6w== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794825954; b=S0v50WtZ4V+ruGuinjmhYMhi2FO5s1/Pi0REUtakoDWciuvhB+QSE0aGFm8CF7rSL9uBx3 vpvzSigSkdwWkD7ajwXscjZJaf+PiGN0q/9LS7RadP/Er3orcv4ojFNWQ7UmSSBqYyQ1JN tDV/pTzXlr4bCSnfsmKr15jhSTWW2oml7QQJNMbmJrxNGU/+yzaGFeNfHfKZNkyAxsC5QO xnbLesmrWf6nd4weCfcsU/rdDaBybEsOcmizS9mOlXs9XTOcoi0oAGdDlsnZ1+P/VKNcbW Zy3lEF2xzbo28aXEvi0kLMW/hMq+dpkkbCO8xj8OFs6sZ2HwEJLSz+auayzYrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794825954; 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=bw7Sexp2i4gxNKmtNTIBxsR8rsaARbsqdyJWcUsTjSM=; b=F4XW5GWem1RaFj4kgnGlLz4aZL8FAV5flFMJ0kFfIIo/PMAWv/bVXHPcovh4RRWhqYbe+f Ko0jVXGnixHW9X41fB0KVNz4FhSRYmc8jDz8TRrudNOoLhqSLSo04R+NFgrTCNe7J9wk0d ucny2yubJIqccXSGBQbBf8V7xkmNiWQLsuc0OwawS4FrHw4V1U5LBmrqIr+WUb8WGSHDN7 j9DmsY8+pCrTCmQixriy8VbWnt98Q54MCPmEnhIAEAdBXm4+sJuDK+La+3jWefylnOrVxP kbPPUpElWB3MLxqdBNKQisfBzImdbqOxNlvdwqtpwiCunb0K29jb/W6yzWtPGQ== 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 4jSkzk3VrZzrFS for ; Mon, 16 Nov 2026 10:45:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f527 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Nov 2026 10:45:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 4a9770b9256c - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 4a9770b9256c7119da287b15a6e7900298e6d514 Auto-Submitted: auto-generated Date: Mon, 16 Nov 2026 10:45:54 +0000 Message-Id: <6afadee2.f527.51ef1993@gitrepo.freebsd.org> The branch stable/15 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=4a9770b9256c7119da287b15a6e7900298e6d514 commit 4a9770b9256c7119da287b15a6e7900298e6d514 Author: Brooks Davis AuthorDate: 2026-11-13 10:06:52 +0000 Commit: Brooks Davis CommitDate: 2026-11-16 10:45:16 +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 (cherry picked from commit ef726c645300870b6bdf3573079b1f89f3b45c74) --- 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)