diff options
| author | Lucas De Marchi <lucas.de.marchi@gmail.com> | 2013-05-09 10:54:37 -0300 |
|---|---|---|
| committer | Lucas De Marchi <lucas.de.marchi@gmail.com> | 2013-05-09 23:55:56 -0300 |
| commit | 1786cdc5a3d3473c06cdfa657326771def69924f (patch) | |
| tree | 896a1552b2c9e9e66ff30a534a884afdcfba5e48 | |
| parent | 438bddc3e56b854b258d6be10d6bc733f9e8df3b (diff) | |
| download | linux-1786cdc5a3d3473c06cdfa657326771def69924f.tar.gz | |
kmod: Use argv_split(), passing module as extra param
Now that argv_split() leaves room for extra parameter, make
call_modprobe() use it.
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
| -rw-r--r-- | kernel/kmod.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/kernel/kmod.c b/kernel/kmod.c index 166aff595a1f6a..70df90b1545447 100644 --- a/kernel/kmod.c +++ b/kernel/kmod.c @@ -67,12 +67,12 @@ static DECLARE_RWSEM(umhelper_sem); /* modprobe_path is set via /proc/sys. */ -char modprobe_path[KMOD_PATH_LEN] = "/sbin/modprobe"; +char modprobe_path[KMOD_PATH_LEN] = "/sbin/modprobe -q --"; static void free_modprobe_argv(struct subprocess_info *info) { kfree(info->argv[3]); /* check call_modprobe() */ - kfree(info->argv); + argv_free(info->argv); } static int call_modprobe(char *module_name, int wait) @@ -84,8 +84,10 @@ static int call_modprobe(char *module_name, int wait) "PATH=/sbin:/usr/sbin:/bin:/usr/bin", NULL }; + int argc; + char **argv; - char **argv = kmalloc(sizeof(char *[5]), GFP_KERNEL); + argv = argv_split(GFP_KERNEL, modprobe_path, &argc, 1); if (!argv) goto out; @@ -93,13 +95,8 @@ static int call_modprobe(char *module_name, int wait) if (!module_name) goto free_argv; - argv[0] = modprobe_path; - argv[1] = "-q"; - argv[2] = "--"; - argv[3] = module_name; /* check free_modprobe_argv() */ - argv[4] = NULL; - - info = call_usermodehelper_setup(modprobe_path, argv, envp, GFP_KERNEL, + argv[argc] = module_name; /* check free_modprobe_argv() */ + info = call_usermodehelper_setup(argv[0], argv, envp, GFP_KERNEL, NULL, free_modprobe_argv, NULL); if (!info) goto free_module_name; @@ -109,7 +106,7 @@ static int call_modprobe(char *module_name, int wait) free_module_name: kfree(module_name); free_argv: - kfree(argv); + argv_free(argv); out: return -ENOMEM; } |