AuxXxilium/kmod
1
0
Fork 0
mirror of https://github.com/AuxXxilium/kmod.git synced 2025-02-23 10:18:13 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

libkmod-config: re-quote option from kernel cmdline

Browse Source 
It was reported that grub mangles the kernel cmdline. It turns

	acpi_cpufreq.dyndbg="file drivers/cpufreq/acpi-cpufreq.c +mpf"

	into

	"acpi_cpufreq.dyndbg=file drivers/cpufreq/acpi-cpufreq.c +mpf"

However, even though we could blame grub for doing that, the kernel
happily accepts and re-quotes it when the module is built-in.
So, it's better if kmod also understands it this way and does the same.

Here we basically add additional code to un-mangle it, moving the quote
in way that is acceptable to pass through init_module(). Note that the
interface [f]init_module() gives us mandates the quote to be part of the
value: the module name is not passed and the options are separated by
space.

Reported-by: Jiri Slaby <jirislaby@kernel.org>
Tested-by: Jessica Yu <jeyu@kernel.org>
Link: https://bugzilla.suse.com/show_bug.cgi?id=1181111#c10
This commit is contained in:
Lucas De Marchi 2021-02-12 01:45:22 -08:00
parent 01ed9af61e
commit d3a1fe67b6
10 changed files with 109 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libkmod/libkmod-config.c
View File

@ -498,7 +498,7 @@ static int kmod_config_parse_kcmdline(struct kmod_config *config)
{
char buf[KCMD_LINE_SIZE];
int fd, err;
char *p, *modname, *param = NULL, *value = NULL;
char *p, *p_quote_start, *modname, *param = NULL, *value = NULL;
bool is_quoted = false, iter = true;
enum state {
STATE_IGNORE,
@ -524,10 +524,23 @@ static int kmod_config_parse_kcmdline(struct kmod_config *config)
}
state = STATE_MODNAME;
p_quote_start = NULL;
for (p = buf, modname = buf; iter; p++) {
switch (*p) {
case '"':
is_quoted = !is_quoted;
/*
* only allow starting quote as first char when looking
* for a modname: anything else is considered ill-formed
*/
if (is_quoted && state == STATE_MODNAME && p == modname) {
p_quote_start = p;
modname = p + 1;
} else if (state != STATE_VALUE) {
state = STATE_IGNORE;
}
break;
case '\0':
case '\n':
@ -550,6 +563,7 @@ static int kmod_config_parse_kcmdline(struct kmod_config *config)
*/
modname = p + 1;
state = STATE_MODNAME;
p_quote_start = NULL;
}
break;
case '.':
@ -576,10 +590,30 @@ static int kmod_config_parse_kcmdline(struct kmod_config *config)
}
if (state == STATE_COMPLETE) {
/*
* We may need to re-quote to unmangle what the
* bootloader passed. Example: grub passes the option as
* "parport.dyndbg=file drivers/parport/ieee1284_ops.c +mpf"
* instead of
* parport.dyndbg="file drivers/parport/ieee1284_ops.c +mpf"
*/
if (p_quote_start && p_quote_start < modname) {
/*
* p_quote_start
* |
* |modname param value
* || | |
* vv v v
* "parport\0dyndbg=file drivers/parport/ieee1284_ops.c +mpf" */
memmove(p_quote_start, modname, value - modname);
value--; modname--; param--;
*value = '"';
}
kcmdline_parse_result(config, modname, param, value);
/* start over on next iteration */
modname = p + 1;
state = STATE_MODNAME;
p_quote_start = NULL;
}
}

5
testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline7/correct.txt Normal file
View File

@ -0,0 +1,5 @@
options psmouse foo
options parport dyndbg="file drivers/parport/ieee1284_ops.c +mpf"
# End of configuration files. Dumping indexes now:

5
testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline7/module-param-kcmdline7/correct.txt Normal file
View File

@ -0,0 +1,5 @@
options psmouse foo
options parport dyndbg="file drivers/parport/ieee1284_ops.c +mpf"
# End of configuration files. Dumping indexes now:

1
testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline7/module-param-kcmdline7/proc/cmdline Normal file
View File

@ -0,0 +1 @@
psmouse.foo parport.dyndbg="file drivers/parport/ieee1284_ops.c +mpf" quiet rw

1
testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline7/proc/cmdline Normal file
View File

@ -0,0 +1 @@
psmouse.foo parport.dyndbg="file drivers/parport/ieee1284_ops.c +mpf" quiet rw

5
testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline8/correct.txt Normal file
View File

@ -0,0 +1,5 @@
options psmouse foo
options parport dyndbg="file drivers/parport/ieee1284_ops.c +mpf"
# End of configuration files. Dumping indexes now:

5
testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline8/module-param-kcmdline7/correct.txt Normal file
View File

@ -0,0 +1,5 @@
options psmouse foo
options parport dyndbg="file drivers/parport/ieee1284_ops.c +mpf"
# End of configuration files. Dumping indexes now:

1
testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline8/module-param-kcmdline7/proc/cmdline Normal file
View File

@ -0,0 +1 @@
psmouse.foo parport.dyndbg="file drivers/parport/ieee1284_ops.c +mpf" quiet rw

1
testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline8/proc/cmdline Normal file
View File

@ -0,0 +1 @@
psmouse.foo "parport.dyndbg=file drivers/parport/ieee1284_ops.c +mpf" quiet rw

50
testsuite/test-modprobe.c
View File

@ -359,6 +359,56 @@ DEFINE_TEST(modprobe_param_kcmdline6,
);
static noreturn int modprobe_param_kcmdline7(const struct test *t)
{
const char *progname = ABS_TOP_BUILDDIR "/tools/modprobe";
const char *const args[] = {
progname,
"-c",
NULL,
};
test_spawn_prog(progname, args);
exit(EXIT_FAILURE);
}
DEFINE_TEST(modprobe_param_kcmdline7,
.description = "check if dots on other parts of kcmdline don't confuse our parser",
.config = {
[TC_UNAME_R] = "4.4.4",
[TC_ROOTFS] = TESTSUITE_ROOTFS "test-modprobe/module-param-kcmdline7",
},
.output = {
.out = TESTSUITE_ROOTFS "test-modprobe/module-param-kcmdline7/correct.txt",
},
.modules_loaded = "",
);
static noreturn int modprobe_param_kcmdline8(const struct test *t)
{
const char *progname = ABS_TOP_BUILDDIR "/tools/modprobe";
const char *const args[] = {
progname,
"-c",
NULL,
};
test_spawn_prog(progname, args);
exit(EXIT_FAILURE);
}
DEFINE_TEST(modprobe_param_kcmdline8,
.description = "check if dots on other parts of kcmdline don't confuse our parser",
.config = {
[TC_UNAME_R] = "4.4.4",
[TC_ROOTFS] = TESTSUITE_ROOTFS "test-modprobe/module-param-kcmdline8",
},
.output = {
.out = TESTSUITE_ROOTFS "test-modprobe/module-param-kcmdline8/correct.txt",
},
.modules_loaded = "",
);
static noreturn int modprobe_force(const struct test *t)
{
const char *progname = ABS_TOP_BUILDDIR "/tools/modprobe";