libkmod: Fix missing module normalization from kernel cmdline

Normalize it before adding the blacklist. Without normalizing it we
have, with just the test addition:

	$ ./build/testsuite/test-modprobe modprobe_param_kcmdline9
	TESTSUITE: running modprobe_param_kcmdline9, in forked context
	TESTSUITE: ERR: Outputs do not match on STDOUT:
	TESTSUITE: ERR: correct:
	...
	blacklist foo_bar
	...
	TESTSUITE: ERR: wrong:
	blacklist foo-bar
	TESTSUITE: ERR: FAILED: exit ok but outputs do not match: modprobe_param_kcmdline9

Link: https://github.com/kmod-project/kmod/pull/312
Signed-off-by: Lucas De Marchi <demarchi@kernel.org>

diff --git a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c
index 3f21e46cff694e6cb6c58d34a0a6bd712f2fb881..6938ff99947322f55394c6e0b8fbaa41704e9a58 100644 (file)
--- a/libkmod/libkmod-config.c
+++ b/libkmod/libkmod-config.c
@@ -618,6 +618,9 @@ static void kcmdline_parse_result(struct kmod_config *config, char *modname, cha
                        if (t == NULL)
                                break;
 
+                       if (underscores(t) < 0)
+                               continue;
+
                        kmod_config_add_blacklist(config, t);
                }
        } else {

diff --git a/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline9/correct.txt b/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline9/correct.txt
index e69f813dd7cd40c39f245f7e6e527500cbb5302f..f8399e12cb76d69fac67587594cf743d5d400176 100644 (file)
--- a/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline9/correct.txt
+++ b/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline9/correct.txt
@@ -3,6 +3,7 @@ blacklist bar
 blacklist foo2
 blacklist bar2
 blacklist foobar
+blacklist foo_bar
 
 # End of configuration files. Dumping indexes now:
 

diff --git a/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline9/proc/cmdline b/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline9/proc/cmdline
index dc78f9bcf3b94a5ffc103459f47303c40cfae397..fe7af674cf2a8ffad18ecc230ee048c6d6e0cbfe 100644 (file)
--- a/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline9/proc/cmdline
+++ b/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline9/proc/cmdline
@@ -1 +1 @@
-modprobe.blacklist=foo,bar modprobe.blacklist=foo2 quiet modprobe.blacklist=bar2 rw modprobe.blacklist=foobar
+modprobe.blacklist=foo,bar modprobe.blacklist=foo2 quiet modprobe.blacklist=bar2 rw modprobe.blacklist=foobar modprobe.blacklist=foo-bar