Skip to contentSkip to conversation

tst_kconfig: automatic module load/unload for CONFIG_*=m

PATCH Superseded Li Wang 3 participants 14 messages Oct 10 – Oct 14 Library code

v3 of 7 Superseded Latest is v7 →

lore
Share & tools
lore

Li Wang

author
#0 lore raw

v3 cover tst_kconfig: automatic module load/unload for CONFIG_*=m

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 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 (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                           | 80 +++++++++++++++++++++
 lib/tst_module.c                            | 39 ++++++++++
 lib/tst_test.c                              | 11 ++-
 testcases/cve/cve-2025-21756.c              | 36 ++++++++++
 testcases/cve/cve-2026-46331.c              |  7 --
 testcases/cve/sctphantom.c                  |  3 -
 testcases/kernel/syscalls/keyctl/keyctl29.c |  3 -
 testcases/kernel/syscalls/keyctl/keyctl30.c |  3 -
 10 files changed, 193 insertions(+), 18 deletions(-)
Signature · 5 lines
2.56.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
author
#1 lore raw

PATCH v3 1/4 lib: add module is loaded check

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
index e55321d19..9b789e289 100644
@@ -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
index cbd2415d5..db341ec57 100644
@@ -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
author
#5 lore raw

PATCH v3 2/4 tst_kconfig: load and unload kernel modules for CONFIG_*=m

In reply to Li Wang

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     | 78 +++++++++++++++++++++++++++++++++++++++++++
 lib/tst_test.c        | 11 ++++--
 3 files changed, 115 insertions(+), 2 deletions(-)
include/tst_kconfig.h +28 -0
index c454f3467..a525429d4 100644
@@ -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 +78 -0

104 lines not on this page · raw message

lib/tst_test.c +9 -2
index 10ff73397..f55830983 100644
@@ -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
author
#8 lore raw

PATCH v3 3/4 tst_kconfig: add module mappings for vsock/vsock_loopback

In reply to Li Wang

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 nonroot process in the initial namespace, which can use loopback VSOCK on nonprivileged ports. Drop privileges to nobody after module loading and regain root in cleanup() so the modules can be unloaded.

---
 lib/tst_kconfig.c              |  2 ++
 testcases/cve/cve-2025-21756.c | 36 ++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)
lib/tst_kconfig.c +2 -0
index e2f3061c0..d239f39df 100644
@@ -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 +36 -0
index 4245a4c95..a57abeef8 100644
@@ -13,12 +13,40 @@
  * 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 drop_privileges(void)
+{
+	struct passwd *pw = SAFE_GETPWNAM("nobody");
+
+	SAFE_SETEGID(pw->pw_gid);
+	SAFE_SETEUID(pw->pw_uid);
+}
+
+static void restore_privileges(void)
+{
+	SAFE_SETEGID(0);
+	SAFE_SETEUID(0);
+}
+
+static void setup(void)
+{
+	/* This exercises the vulnerability from a non-root context. */
+	drop_privileges();
+}
+
+static void cleanup(void)
+{
+	/* Regain root so that the module can be unloaded. */
+	restore_privileges();
+}
+
 static int vsock_bind(unsigned int cid, unsigned int port, int type)
 {
 	int sock;
@@ -85,8 +113,16 @@ static void run(void)
 }
 
 static struct tst_test test = {
+	.needs_root = 1,
 	.test_all = run,
+	.setup = setup,
+	.cleanup = cleanup,
 	.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
author
#13 lore raw

PATCH v3 4/4 testcases: drop manual tst_modprobe() now handled by tst_kconfig

In reply to Li Wang

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
- 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/keyctl29.c | 3 ---
 testcases/kernel/syscalls/keyctl/keyctl30.c | 3 ---
 4 files changed, 16 deletions(-)
testcases/cve/cve-2026-46331.c +0 -7
index 3d32a1cbb..3c8db5042 100644
@@ -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
index 83834b848..bdbe40286 100644
@@ -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/keyctl29.c +0 -3
index afc0a093c..e66b39bcb 100644
@@ -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
index ef51bba33..4f43007e0 100644
@@ -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
#2 lore raw

Re: [LTP] lib: add module is loaded check

In reply to Li Wang

Hi Li,

Quoted 1 line · Li Wang

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: The new public helper has no kernel-doc comment. Document mod_name, hyphen normalization, return values, and whether built-in modules count as loaded.

--- [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 modprobe fails, tst_modprobe() aborts before modules_loaded becomes true, so cleanup skips modules already loaded successfully. Track each successful load separately and make partial-load cleanup available before invoking the next modprobe.

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 modules loaded before the test and excluded from this list. For example, removing can-raw can remove a pre-existing can module; snapshot dependency ownership and remove only modules loaded by this test.

lib/tst_kconfig.c

Quoted 4 lines
lib/tst_kconfig.c +4 -0
+		tst_cmd(argv, "/dev/null", "/dev/null", TST_CMD_PASS_RETVAL);
+	}
+
+	loaded_module_count = 0;

Medium: Every removal error is discarded, both output streams are suppressed, and the ownership list is then cleared. Keep teardown nonfatal, but report failed removals with TWARN and the module name instead of silently leaving new modules loaded.

--- [PATCH 3/4] ---

testcases/cve/cve-2025-21756.c

Quoted 2 lines
testcases/cve/cve-2025-21756.c +1 -0
+	.needs_root = 1,

Low: Document the new root requirement in the test description: root is needed to load the VSOCK modules, while the reproducer runs as nobody. The commit message explains this, but the exported test description does not.

Verdict - Needs revision

Pre-existing issue (not a patch finding):

The description in testcases/cve/sctphantom.c says to run modprobe sctp manually, although setup() already loaded it before this series.

---
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
#3 lore raw

Re: [LTP] [PATCH v3 1/4] lib: add module is loaded check

In reply to Li Wang

Hi Li,

lib/tst_module.c void tst_module_reload(const char *mod_name, char *const argv[]) · line 187

Quoted 10 lines
lib/tst_module.c +10 -0
+
+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;

why not using SAFE_FILE_LINES_SCANF() ?

--
Andrea Cervesato
SUSE QE Automation Engineer Linux
[email protected]

Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
#9 lore raw

Re: [LTP] [PATCH v3 3/4] tst_kconfig: add module mappings for vsock/vsock_loopback

In reply to Li Wang

Hi Li,

Quoted 5 lines

The test needs root only to load the modules; the reproducer runs as an ordinary nonroot process in the initial namespace, which can use loopback VSOCK on nonprivileged ports. Drop privileges to nobody after module loading and regain root in cleanup() so the modules can be unloaded.

Please drop the root _only_ if we are root, we shouldn'f force the test to be root always, even when we are user.

--
Andrea Cervesato
SUSE QE Automation Engineer Linux
[email protected]

Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
#6 lore raw

Re: [LTP] [PATCH v3 2/4] tst_kconfig: load and unload kernel modules for CONFIG_*=m

In reply to Li Wang

Hi Li,

lib/tst_kconfig.c static void kconfig_module_check(struct tst_kconfig_var *var) · line 209

Quoted 11 lines
lib/tst_kconfig.c +11 -0
+static const char *module_name_for_config(const char *cfg)
+{
+	size_t i;
+
+	for (i = 0; config_module_maps[i].config; i++) {
+		if (!strcmp(config_module_maps[i].config, cfg))
+			return config_module_maps[i].module_name;
+	}
+
+	return NULL;
+}

This is used only once, we don't need to define a new function. We can leave it inside kconfig_module_record().

Quoted 25 lines
lib/tst_kconfig.c +21 -0
+
+static void kconfig_module_record(const char *cfg)
+{
+	unsigned int i;
+	const char *mod = module_name_for_config(cfg);
+
+	if (!mod)
+		return;
+
+	if (tst_module_is_loaded(mod))
+		return;
+
+	for (i = 0; i < loaded_module_count; i++) {
+		if (!strcmp(loaded_modules[i], mod))
+			return;
+	}
+
+	if (loaded_module_count < MAX_LOADED_MODULES)
+		loaded_modules[loaded_module_count++] = mod;
+}
+
 static inline int kconfig_parse_line(const char *line,
                                      struct tst_kconfig_var *vars,
                                      unsigned int vars_len)

lib/tst_kconfig.c out: · line 310

Quoted 4 lines
lib/tst_kconfig.c +1 -0
@@ -268,6 +307,8 @@ out:
 				vars[i].choice = 'm';
 				kconfig_runtime_check(&vars[i]);
 				kconfig_module_check(&vars[i]);
+				if (vars[i].choice == 'm')

This is better to have it inside kconfig_module_record() at the very beginning as a gate.

--
Andrea Cervesato
SUSE QE Automation Engineer Linux
[email protected]

Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
author
#4 lore raw

Re: [LTP] [PATCH v3 1/4] lib: add module is loaded check

In reply to Andrea Cervesato via ltp

Hi Andrea,

Quoted 14 lines

Hi Li,

lib/tst_module.c void tst_module_reload(const char *mod_name, char *const argv[]) · line 187

Quoted 10 lines
lib/tst_module.c +10 -0
+
+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;

why not using SAFE_FILE_LINES_SCANF() ?

file_lines_scanf() uses a fixed format string, and with arg_count == 0 (e.g. "%s %*s" with only suppressed conversions) it cannot distinguish a matching line from a non-matching one, because vsscanf returns 0 in both cases.

On top of that, /proc/modules needs to walk every line and compare against a module name that is passed in at runtime and may need the '-' to '_' normalization. So it is not a good fit here; a plain fopen()/fgets() loop is clearer.

One more concern: /proc/modules may not exist at all on some platforms. When the kernel is built with CONFIG_MODULES=n there is no module support and /proc/modules is absent, and some container runtimes also do not provide it. With that would trigger tst_brkm(TBROK) and abort the test

Signature · 5 lines
Regards,
Li Wang

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
author
#7 lore raw

Re: [LTP] [PATCH v3 2/4] tst_kconfig: load and unload kernel modules for CONFIG_*=m

In reply to Andrea Cervesato via ltp
Quoted 16 lines · Andrea Cervesato

Hi Li,

lib/tst_kconfig.c static void kconfig_module_check(struct tst_kconfig_var *var) · line 209

Quoted 11 lines
lib/tst_kconfig.c +11 -0
+static const char *module_name_for_config(const char *cfg)
+{
+	size_t i;
+
+	for (i = 0; config_module_maps[i].config; i++) {
+		if (!strcmp(config_module_maps[i].config, cfg))
+			return config_module_maps[i].module_name;
+	}
+
+	return NULL;
+}

This is used only once, we don't need to define a new function. We can leave it inside kconfig_module_record().

+1

Quoted 24 lines
Quoted 24 lines
lib/tst_kconfig.c +21 -0
+
+static void kconfig_module_record(const char *cfg)
+{
+	unsigned int i;
+	const char *mod = module_name_for_config(cfg);
+
+	if (!mod)
+		return;
+
+	if (tst_module_is_loaded(mod))
+		return;
+
+	for (i = 0; i < loaded_module_count; i++) {
+		if (!strcmp(loaded_modules[i], mod))
+			return;
+	}
+
+	if (loaded_module_count < MAX_LOADED_MODULES)
+		loaded_modules[loaded_module_count++] = mod;
+}
+
 static inline int kconfig_parse_line(const char *line,
                                      struct tst_kconfig_var *vars,
                                      unsigned int vars_len)
Quoted 8 lines

lib/tst_kconfig.c out: · line 310

Quoted 5 lines
lib/tst_kconfig.c +1 -0
@@ -268,6 +307,8 @@ out:
 				vars[i].choice = 'm';
 				kconfig_runtime_check(&vars[i]);
 				kconfig_module_check(&vars[i]);
+				if (vars[i].choice == 'm')

This is better to have it inside kconfig_module_record() at the very beginning as a gate.

Good point, thanks!

Signature · 5 lines
Regards,
Li Wang

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
author
#10 lore raw

Re: [LTP] [PATCH v3 3/4] tst_kconfig: add module mappings for vsock/vsock_loopback

In reply to Andrea Cervesato via ltp
Quoted 10 lines · Andrea Cervesato

Hi Li,

Quoted 5 lines

The test needs root only to load the modules; the reproducer runs as an ordinary nonroot process in the initial namespace, which can use loopback VSOCK on nonprivileged ports. Drop privileges to nobody after module loading and regain root in cleanup() so the modules can be unloaded.

Please drop the root _only_ if we are root, we shouldn'f force the test to be root always, even when we are user.

Yes, that's right.

Signature · 5 lines
Regards,
Li Wang

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
author
#11 lore raw

Re: [LTP] [PATCH v3 3/4] tst_kconfig: add module mappings for vsock/vsock_loopback

In reply to Andrea Cervesato via ltp
Quoted 10 lines · Andrea Cervesato

Hi Li,

Quoted 5 lines

The test needs root only to load the modules; the reproducer runs as an ordinary nonroot process in the initial namespace, which can use loopback VSOCK on nonprivileged ports. Drop privileges to nobody after module loading and regain root in cleanup() so the modules can be unloaded.

Please drop the root _only_ if we are root, we shouldn'f force the test to be root always, even when we are user.

After thinking it over, I'd prefer to leave this patch unchanged:

The test does need root, but not for the reproducer itself -- it needs root for setup and cleanup:

- loading vsock_loopback requires CAP_SYS_MODULE;
- unloading it in cleanup() also requires CAP_SYS_MODULE.

Without .needs_root = 1, a non-root run would skip the automatic module load in tst_kconfig, bind() would then fail with EADDRNOTAVAIL and the test would abort with TBROK instead of being skipped cleanly.

Keeping .needs_root = 1 and dropping privileges to nobody in setup() is exactly what makes the reproducer run as an ordinary non-root process while still allowing the modules to be loaded and unloaded.

Signature · 5 lines
Regards,
Li Wang

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#12 lore raw

Re: [LTP] [PATCH v3 3/4] tst_kconfig: add module mappings for vsock/vsock_loopback

Quoted 12 lines · Andrea Cervesato
Quoted 10 lines

Hi Li,

Quoted 5 lines

The test needs root only to load the modules; the reproducer runs as an ordinary nonroot process in the initial namespace, which can use loopback VSOCK on nonprivileged ports. Drop privileges to nobody after module loading and regain root in cleanup() so the modules can be unloaded.

Please drop the root _only_ if we are root, we shouldn'f force the test to be root always, even when we are user.

Quoted 7 lines

After thinking it over, I'd prefer to leave this patch unchanged:

The test does need root, but not for the reproducer itself -- it needs root for setup and cleanup:

- loading vsock_loopback requires CAP_SYS_MODULE;
- unloading it in cleanup() also requires CAP_SYS_MODULE.

yeah we need root for that. This is something we can't workaround.

So I would just avoid defining functions we use once. We can simply merge them with setup/cleanup and keep the needs_root = 1.

Kind Regards,
--
Andrea Cervesato
SUSE QE Automation Engineer Linux
[email protected]

Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp