c5830bdf6
Denys Vlasenko
2011-02-02
Subject
modprobe/insmod: fix parameter quoting
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
modutils/insmod.c+1 -1
| @@ -59,7 +59,7 @@ int insmod_main(int argc UNUSED_PARAM, char **argv) | |
| if (!filename) | |
| bb_show_usage(); | |
| - | rc = bb_init_module(filename, parse_cmdline_module_options(argv)); |
| + | rc = bb_init_module(filename, parse_cmdline_module_options(argv, /*quote_spaces:*/ 0)); |
| if (rc) | |
| bb_error_msg("can't insert '%s': %s", filename, moderror(rc)); | |
modutils/modprobe.c+1 -1
| @@ -589,7 +589,7 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv) | |
| /* First argument is module name, rest are parameters */ | |
| DBG("probing just module %s", *argv); | |
| add_probe(argv[0]); | |
| - | G.cmdline_mopts = parse_cmdline_module_options(argv); |
| + | G.cmdline_mopts = parse_cmdline_module_options(argv, /*quote_spaces:*/ 1); |
| } | |
| /* Happens if all requested modules are already loaded */ | |
modutils/modutils.c+25 -7
| @@ -62,7 +62,7 @@ char* FAST_FUNC filename2modname(const char *filename, char *modname) | |
| return modname; | |
| } | |
| - | char* FAST_FUNC parse_cmdline_module_options(char **argv) |
| + | char* FAST_FUNC parse_cmdline_module_options(char **argv, int quote_spaces) |
| { | |
| char *options; | |
| int optlen; | |
| @@ -70,13 +70,31 @@ char* FAST_FUNC parse_cmdline_module_options(char **argv) | |
| options = xzalloc(1); | |
| optlen = 0; | |
| while (*++argv) { | |
| - | options = xrealloc(options, optlen + 2 + strlen(*argv) + 2); |
| - | /* Spaces handled by "" pairs, but no way of escaping quotes */ |
| - | //TODO: module-init-tools version 3.11.1 quotes only value: |
| - | //it generates var="val with spaces", not "var=val with spaces" |
| - | //(and it won't quote var *name* even if it has spaces) |
| - | optlen += sprintf(options + optlen, (strchr(*argv, ' ') ? "\"%s\" " : "%s "), *argv); |
| + | const char *fmt; |
| + | const char *var; |
| + | const char *val; |
| + | |
| + | var = *argv; |
| + | options = xrealloc(options, optlen + 2 + strlen(var) + 2); |
| + | fmt = "%.*s%s "; |
| + | val = strchrnul(var, '='); |
| + | if (quote_spaces) { |
| + | /* |
| + | * modprobe (module-init-tools version 3.11.1) compat: |
| + | * quote only value: |
| + | * var="val with spaces", not "var=val with spaces" |
| + | * (note: var *name* is not checked for spaces!) |
| + | */ |
| + | if (*val) { /* has var=val format. skip '=' */ |
| + | val++; |
| + | if (strchr(val, ' ')) |
| + | fmt = "%.*s\"%s\" "; |
| + | } |
| + | } |
| + | optlen += sprintf(options + optlen, fmt, (int)(val - var), var, val); |
| } | |
| + | /* Remove trailing space. Disabled */ |
| + | /* if (optlen != 0) options[optlen-1] = '\0'; */ |
| return options; | |
| } | |
modutils/modutils.h+1 -1
| @@ -21,7 +21,7 @@ void replace(char *s, char what, char with) FAST_FUNC; | |
| char *replace_underscores(char *s) FAST_FUNC; | |
| int string_to_llist(char *string, llist_t **llist, const char *delim) FAST_FUNC; | |
| char *filename2modname(const char *filename, char *modname) FAST_FUNC; | |
| - | char *parse_cmdline_module_options(char **argv) FAST_FUNC; |
| + | char *parse_cmdline_module_options(char **argv, int quote_spaces) FAST_FUNC; |
| /* insmod for 2.4 and modprobe's options (insmod 2.6 has no options at all): */ | |
| #define INSMOD_OPTS \ | |