korg/kmod
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git synced 2024-12-04 09:13:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

libkmod-config: fix parsing quoted kernel cmdline on params

Browse Source 
We can only accept quoted values, not module names or parameter names.
This commit is contained in:
Lucas De Marchi 2017-02-16 09:18:35 -08:00
parent 8df21177fb
commit 31dd40a6b8
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libkmod/libkmod-config.c
View File

@ -517,10 +517,24 @@ static int kmod_config_parse_kcmdline(struct kmod_config *config)
for (p = buf, modname = buf; *p != '\0' && *p != '\n'; p++) { for (p = buf, modname = buf; *p != '\0' && *p != '\n'; p++) {
if (*p == '"') { if (*p == '"') {
is_quoted = !is_quoted; is_quoted = !is_quoted;
if (is_quoted) {
/* don't consider a module until closing quotes */
is_module = false;
} else if (param != NULL && value != NULL) {
/*
* If we are indeed expecting a value and
* closing quotes, then this can be considered
* a valid option for a module
*/
is_module = true;
}
continue; continue;
} }
if (is_quoted) if (is_quoted)
continue; continue;
switch (*p) { switch (*p) {
case ' ': case ' ':
*p = '\0'; *p = '\0';

2
testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline5/proc/cmdline
View File

@ -1 +1 @@
psmouse.foo psmouse.bar=1 psmouse.foobar="test 1" " notamodule" "noteamodule2 " notamodule3 " quiet rw psmouse.foo psmouse.bar=1 psmouse.foobar="test 1" psmouse."invalid option" " notamodule" "noteamodule2 " notamodule3 quiet rw