tst_kconfig: automatic module load/unload for CONFIG_*=m
v5 cover tst_kconfig: automatic module load/unload for CONFIG_*=m
From: "Li Wang (Hieco)" <[email protected]>
Tests that depend on a config set to =m currently load the module themselves, and may fail with misleading errors when it is missing, e.g. bind() returning EADDRNOTAVAIL for AF_VSOCK without vsock_loopback.
This series makes tst_kconfig record the module for every config_module_maps[] entry seen as =m, load them once the kernel config check passes, and unload them at cleanup time.
Changes in v5:
- cve-2025-21756.c: merge drop_privileges into setup and drop cleanup.
- keyctl23.c: remove tst_modprobe() so it can run on Android.
Changes in v4:
- tst_kconfig: fold module_name_for_config() into kconfig_module_record()
- tst_kconfig: move the choice == 'm' gate into kconfig_module_record() and pass struct tst_kconfig_var * instead of the raw config name.
Changes in v3:
- Queue only configs that stay 'm' after kconfig_module_check(), so a module downgraded to 'n' does not abort an otherwise runnable test.
- Unload with "modprobe -r" instead of "rmmod" to also remove dependencies pulled in by modprobe.
- Drop the redundant geteuid() check in the unload path.
- Raise MAX_LOADED_MODULES from 16 to 32.
- cve-2025-21756: drop privileges to nobody after module loading and regain root in cleanup(), so the reproducer runs from a non-root context while the framework can still unload modules.
Changes in v2:
- Add tst_module_is_loaded() helper.
- Only load/unload modules that are not already loaded.
- Skip automatic loading when KCONFIG_SKIP_CHECK=1, keeping the semantics consistent with skipping the config check.
- Document the KCONFIG_SKIP_CHECK=1 behaviour for keyctl29/keyctl30 and the vsock/vsock_loopback mapping.
Li Wang (Hieco) (4):
lib: add module is loaded check
tst_kconfig: load and unload kernel modules for CONFIG_*=m
tst_kconfig: add module mappings for vsock/vsock_loopback
testcases: drop manual tst_modprobe() now handled by tst_kconfig
include/tst_kconfig.h | 28 ++++++++ include/tst_module.h | 1 + lib/tst_kconfig.c | 77 +++++++++++++++++++++ lib/tst_module.c | 39 +++++++++++ lib/tst_test.c | 11 ++- testcases/cve/cve-2025-21756.c | 17 +++++ testcases/cve/cve-2026-46331.c | 7 -- testcases/cve/sctphantom.c | 3 - testcases/kernel/syscalls/keyctl/keyctl23.c | 5 -- testcases/kernel/syscalls/keyctl/keyctl29.c | 3 - testcases/kernel/syscalls/keyctl/keyctl30.c | 3 - 11 files changed, 171 insertions(+), 23 deletions(-)
Signature · 5 lines
2.56.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v5 1/4 lib: add module is loaded check
From: "Li Wang (Hieco)" <[email protected]>
Add a helper that checks whether a kernel module is loaded by looking it up in /proc/modules. Module names are normalized so that hyphens match the underscores used by the kernel.
--- include/tst_module.h | 1 + lib/tst_module.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+)
include/tst_module.h +1 -0
@@ -49,5 +49,6 @@ static inline void tst_requires_module_signature_disabled(void)void tst_modprobe (const char *mod_name,char *const argv[]);void tst_module_reload (const char *mod_name,char *const argv[]); +bool tst_module_is_loaded (const char *mod_name);#endif /* TST_MODULE_H */
lib/tst_module.c +39 -0
@@ -21,6 +21,7 @@*/ #define _GNU_SOURCE +#include <ctype.h> #include <stdio.h> #include <stdlib.h> #include <unistd.h>
@@ -174,3 +175,41 @@ void tst_module_reload(const char *mod_name, char *const argv[])tst_module_unload_ (NULL , mod_name);tst_modprobe (mod_name, argv); } + +bool tst_module_is_loaded (const char *mod_name) +{ +char line[4096 ]; +size_t mod_len =strlen (mod_name); +FILE *file; + + file =fopen ("/proc/modules" ,"r" ); +if (!file) +return false; + +while (fgets (line,sizeof (line), file)) { +char *p = line; +size_t i; + +while (*p && !isspace (*p)) + p++; + +if ((size_t )(p - line) != mod_len) +continue ; + +for (i =0 ; i < mod_len; i++) { +char a = (line[i] =='-' ) ?'_' : line[i]; +char b = (mod_name[i] =='-' ) ?'_' : mod_name[i]; + +if (a != b) +break ; + } + +if (i == mod_len) { +fclose (file); +return true; + } + } + +fclose (file); +return false; +}
Signature · 5 lines
2.56.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v5 2/4 tst_kconfig: load and unload kernel modules for CONFIG_*=m
In reply to Li WangFrom: "Li Wang (Hieco)" <[email protected]>
Tests that depend on a config set to =m must currently load the module themselves, and may fail with misleading errors when it is not loaded, e.g. bind() returning EADDRNOTAVAIL for AF_VSOCK when vsock_loopback is missing.
Record the module for every config_module_maps[] entry seen as =m during kconfig_parse_line(), load them in tst_kconfig_module_load() via tst_modprobe(), and unload them in reverse order from tst_kconfig_module_unload_all(), called by do_test_cleanup(). Modules still in use are skipped without aborting the test.
Loading and unloading are performed only as root; otherwise the recorded list is left untouched.
--- include/tst_kconfig.h | 28 ++++++++++++++++ lib/tst_kconfig.c | 75 +++++++++++++++++++++++++++++++++++++++++++ lib/tst_test.c | 11 +++++-- 3 files changed, 112 insertions(+), 2 deletions(-)
include/tst_kconfig.h +28 -0
@@ -105,4 +105,32 @@ void tst_kcmdline_parse(struct tst_kcmdline_var params[], size_t params_len);*/ int tst_has_slow_kconfig (void ); +/** +* tst_kconfig_module_load() - Load kernel modules for CONFIG_*=m entries. +* +* Loads every module recorded during the last kernel config check, in +* the order they were discovered. The list is populated by +* kconfig_module_record() from kconfig_parse_line() for each CONFIG_* +* entry that is set to =m and has a matching entry in +* config_module_maps[]. +* +* Loading is skipped when not running as root, and does nothing when +* the recorded list is empty. +*/ +void tst_kconfig_module_load (void ); + +/** +* tst_kconfig_module_unload_all() - Unload modules loaded by +* tst_kconfig_module_load(). +* +* Unloads every module recorded by tst_kconfig_module_load(), in +* reverse load order so that inter-module dependencies are respected. +* Modules still in use are skipped silently, leaving the system state +* as close as possible to what it was before the test started. +* +* Called from do_test_cleanup() so that the modules are released when +* the test finishes, regardless of the test result. +*/ +void tst_kconfig_module_unload_all (void ); +#endif /* TST_KCONFIG_H__ */
lib/tst_kconfig.c +75 -0
101 lines not on this page · raw message
lib/tst_test.c +9 -2
@@ -1471,8 +1471,12 @@ static void do_setup(int argc, char *argv[])check_supported_kver (); -if (tst_test->needs_kconfigs &&tst_kconfig_check (tst_test->needs_kconfigs)) -tst_brk (TCONF ,"Aborting due to unsuitable kernel config, see above!" ); +if (tst_test->needs_kconfigs) { +if (tst_kconfig_check (tst_test->needs_kconfigs)) +tst_brk (TCONF ,"Aborting due to unsuitable kernel config, see above!" ); + +tst_kconfig_module_load (); + }if (tst_test->needs_root &&geteuid () !=0 )tst_brk (TCONF ,"Test needs to be run as root" );
@@ -1690,6 +1694,9 @@ static void do_cleanup(void)if (tst_test->restore_wallclock)tst_wallclock_restore (); +if (tst_test->needs_kconfigs) +tst_kconfig_module_unload_all (); +cleanup_ipc (); }
Signature · 5 lines
2.56.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v5 3/4 tst_kconfig: add module mappings for vsock/vsock_loopback
In reply to Li WangFrom: "Li Wang (Hieco)" <[email protected]>
Map CONFIG_VSOCKETS to "vsock" and CONFIG_VSOCKETS_LOOPBACK to "vsock_loopback" so tst_kconfig can load them on demand.
cve-2025-21756 binds to VMADDR_CID_LOCAL and therefore needs vsock_loopback. Without the module loaded, bind() fails with EADDRNOTAVAIL and the test aborts with TBROK. Declare both configs in needs_kconfigs so the modules are loaded first.
The test needs root only to load the modules; the reproducer runs as an ordinary non-root process in the initial namespace, where it can use loopback VSOCK on non-privileged ports. Drop privileges to nobody in setup() after the modules are loaded; the framework unloads the modules from its still-root context, so no restore is needed in cleanup().
--- lib/tst_kconfig.c | 2 ++ testcases/cve/cve-2025-21756.c | 17 +++++++++++++++++ 2 files changed, 19 insertions(+)
lib/tst_kconfig.c +2 -0
@@ -174,6 +174,8 @@ static struct config_module_map { {"CONFIG_NET_ACT_PEDIT", "act_pedit"}, {"CONFIG_PKCS8_PRIVATE_KEY_PARSER", "pkcs8_key_parser"}, {"CONFIG_X509_CERTIFICATE_PARSER", "x509_key_parser"}, + {"CONFIG_VSOCKETS", "vsock"}, + {"CONFIG_VSOCKETS_LOOPBACK", "vsock_loopback"}, {} };
testcases/cve/cve-2025-21756.c +17 -0
@@ -13,12 +13,22 @@* Beware, this test will crash the system. */ +#include <pwd.h> +#include "tst_test.h" #include "lapi/vm_sockets.h" #define MAX_PORT_RETRIES 24#define VMADDR_CID_NONEXISTING 42 +static void setup (void ) +{ +struct passwd *pw =SAFE_GETPWNAM ("nobody" ); + +SAFE_SETEGID (pw->pw_gid); +SAFE_SETEUID (pw->pw_uid); +} +static int vsock_bind (unsigned int cid,unsigned int port,int type) {int sock;
@@ -85,8 +95,15 @@ static void run(void) }static struct tst_test test = { + .needs_root =1 , + .setup = setup, .test_all = run, .taint_check =TST_TAINT_W |TST_TAINT_D , + .needs_kconfigs = (const char *const []) { +"CONFIG_VSOCKETS" , +"CONFIG_VSOCKETS_LOOPBACK" , +NULL + }, .tags = (const struct tst_tag []) { {"linux-git" ,"fcdd2242c0231032fc84e1404315c245ae56322a" }, {"CVE" ,"2025-21756" },
Signature · 5 lines
2.56.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v5 4/4 testcases: drop manual tst_modprobe() now handled by tst_kconfig
In reply to Li WangFrom: "Li Wang (Hieco)" <[email protected]>
Now that tst_kconfig loads the modules for every CONFIG_*=m entry listed in config_module_maps[] and unloads them again at cleanup time, tests no longer have to call tst_modprobe() from setup().
Drop the explicit tst_modprobe() calls, and the now unused tst_module.h includes, from:
- cve-2026-46331.c: sch_ingress, cls_matchall, act_pedit
- sctphantom.c: sctp
- keyctl23.c: x509_key_parser
- keyctl29.c: x509_key_parser
- keyctl30.c: pkcs8_key_parser
All four tests already declare the matching configs in .needs_kconfigs, so tst_kconfig takes care of loading the modules before setup() runs and unloading them once the test finishes.
BTW, with KCONFIG_SKIP_CHECK=1 the config check returns early, so the automatic module loading is skipped as well. Users who set that variable are expected to ensure the required modules are loaded themselves.
--- testcases/cve/cve-2026-46331.c | 7 ------- testcases/cve/sctphantom.c | 3 --- testcases/kernel/syscalls/keyctl/keyctl23.c | 5 ----- testcases/kernel/syscalls/keyctl/keyctl29.c | 3 --- testcases/kernel/syscalls/keyctl/keyctl30.c | 3 --- 5 files changed, 21 deletions(-)
testcases/cve/cve-2026-46331.c +0 -7
@@ -44,7 +44,6 @@#include <linux/rtnetlink.h> #include "tst_test.h" -#include "tst_module.h" #include "tst_net.h" #include "tst_netdevice.h" #include "lapi/if_ether.h"
@@ -136,12 +135,6 @@ static void setup(void) {struct sockaddr_in addr;struct passwd *pw; -static const char *const mods[] = { -"sch_ingress" ,"cls_matchall" ,"act_pedit" - }; - -for (unsigned int i =0 ; i <ARRAY_SIZE (mods); i++) -tst_modprobe (mods[i],NULL );/* Drop privileges so the reproducer runs as an unprivileged user */ pw =SAFE_GETPWNAM ("nobody" );
testcases/cve/sctphantom.c +0 -3
@@ -50,7 +50,6 @@*/ #include "tst_test.h" -#include "tst_module.h" #include "tst_checksum.h" #include "tst_safe_net.h"
@@ -205,8 +204,6 @@ static void setup(void) };const struct tst_path_val *sysctl; -tst_modprobe ("sctp" ,NULL ); -for (sysctl = sysctls; sysctl->path; sysctl++)tst_sys_conf_save (sysctl);
testcases/kernel/syscalls/keyctl/keyctl23.c +0 -5
@@ -6,8 +6,6 @@/*\ * Test ``KEYCTL_RESTRICT_KEYRING`` builtin_trusted of :manpage:`keyctl(2)`. * -* Requires root (CAP_SYS_MODULE) to load the ``x509_key_parser`` module. -* * [Algorithm] * * - restrict a keyring with ``asymmetric`` and ``builtin_trusted``
@@ -16,7 +14,6 @@*/ #include "keyctl_common.h" -#include "tst_module.h" #define PAYLOAD "payload"
@@ -89,8 +86,6 @@ static void setup(void) {SAFE_KEYCTL (KEYCTL_JOIN_SESSION_KEYRING ,0 ,0 ,0 ,0 ); -tst_modprobe ("x509_key_parser" ,NULL ); - ring_builtin =SAFE_NEW_RING ("ltpkeyctl23_builtin" ); user_key = SAFE_NEW_USER_KEY("k", PAYLOAD, sizeof(PAYLOAD),
testcases/kernel/syscalls/keyctl/keyctl29.c +0 -3
@@ -23,7 +23,6 @@#include "keyctl_common.h" #include "keyctl_pkey_data.h" -#include "tst_module.h" static key_serial_t cert_key;static struct keyctl_pkey_query *query_buf;
@@ -32,8 +31,6 @@ static void setup(void) {SAFE_KEYCTL (KEYCTL_JOIN_SESSION_KEYRING ,0 ,0 ,0 ,0 ); -tst_modprobe ("x509_key_parser" ,NULL ); - cert_key =add_asymmetric_key_or_tconf ("cert" , rsa2048_cert,sizeof (rsa2048_cert),"CONFIG_X509_CERTIFICATE_PARSER" );
testcases/kernel/syscalls/keyctl/keyctl30.c +0 -3
@@ -20,7 +20,6 @@#include "keyctl_common.h" #include "keyctl_pkey_data.h" -#include "tst_module.h" static key_serial_t priv_key;static struct keyctl_pkey_query *query_buf;
@@ -29,8 +28,6 @@ static void setup(void) {SAFE_KEYCTL (KEYCTL_JOIN_SESSION_KEYRING ,0 ,0 ,0 ,0 ); -tst_modprobe ("pkcs8_key_parser" ,NULL ); - priv_key =add_asymmetric_key_or_tconf ("priv" , rsa2048_pkcs8,sizeof (rsa2048_pkcs8),"CONFIG_PKCS8_PRIVATE_KEY_PARSER" );
Signature · 5 lines
2.56.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] lib: add module is loaded check
In reply to Li WangHi Li,
Quoted 1 line · Li Wang (Hieco)
lib: add module is loaded check
--- [PATCH 1/4] ---
include/tst_module.h static inline void tst_requires_module_signature_disabled(void) · line 52
Quoted 2 lines
include/tst_module.h +1
-0+bool tst_module_is_loaded (const char *mod_name);
Low: Add kernel-doc for this new public helper, documenting mod_name, hyphen/underscore normalization, and its return semantics, including built-in modules and failure to open /proc/modules.
--- [PATCH 2/4] ---
lib/tst_kconfig.c
Quoted 7 lines
lib/tst_kconfig.c +6
-0+for (i =0 ; i < loaded_module_count; i++) { +tst_res (TDEBUG ,"Loading module '%s'" , loaded_modules[i]); +tst_modprobe (loaded_modules[i],NULL ); + } + + modules_loaded = true;
High: If a later tst_modprobe() aborts, modules_loaded is still false, so do_cleanup() skips unloading earlier successfully loaded modules. Track successful loads incrementally and make that prefix eligible for cleanup before attempting the next load.
lib/tst_kconfig.c
Quoted 2 lines
lib/tst_kconfig.c +2
-0+const char *const argv[] = {"modprobe" ,"-r" , + loaded_modules[i -1 ],NULL };
High: modprobe -r also removes unused dependencies, including pre-existing
ones: if can is already loaded and this run loads can-raw, cleanup can remove both. Track ownership of dependencies and use targeted removal so cleanup preserves modules that were loaded before the test.
include/tst_kconfig.h
Quoted 2 lines
include/tst_kconfig.h +1
-0+* Called from do_test_cleanup() so that the modules are released when
Low: The call is in do_cleanup() in the library parent, not do_test_cleanup() in the test child. Correct this comment and the same statement in the commit message.
--- [PATCH 3/4] ---
testcases/cve/cve-2025-21756.c
Quoted 3 lines
testcases/cve/cve-2025-21756.c +2
-0+ .needs_root = 1, + .setup = setup,
Low: Document the new root requirement in the test's description block:
root preloads the vsock modules, then setup drops privileges before running the reproducer.
--- [PATCH 4/4] ---
testcases/kernel/syscalls/keyctl/keyctl23.c
Quoted 3 lines
testcases/kernel/syscalls/keyctl/keyctl23.c +0
-2-* Requires root (CAP_SYS_MODULE) to load the ``x509_key_parser`` module. -*
Low: Remove keyctl23's remaining .needs_root = 1 alongside this explanation and the load call. Its CONFIG_X509_CERTIFICATE_PARSER=y requirement means the automatic loader has no parser module to load, and the remaining operations act on the caller's own keyrings.
Quoted 1 line
All four tests already declare the matching configs in
Low: The list and diff contain five tests, not four.
Verdict - Needs revision
---
Note:
The agent can sometimes produce false positives although often its findings are genuine. If you find issues with the review, please comment this email or ignore the suggestions.
Regards,
LTP AI Reviewer
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp