summaryrefslogtreecommitdiff
path: root/kmodloader.c
diff options
context:
space:
mode:
authorYousong Zhou <yszhou4tech@gmail.com>2017-01-14 01:00:32 +0800
committerFelix Fietkau <nbd@nbd.name>2017-01-15 18:52:19 +0100
commita62c946ecdced9468ad16738325ee322029b0476 (patch)
tree90ba0e72bea57437cf2f7cc1d3cee1c4feb46c0d /kmodloader.c
parent46a4b5f70aef35f1da70a72400cd8f34083d7501 (diff)
downloadubox-a62c946ecdced9468ad16738325ee322029b0476.tar.gz
kmodloader: modprobe: skip possible command line arguments
The kernel may invocate user mode modprobe with the following scheme modprobe -q -- <module_name> Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
Diffstat (limited to 'kmodloader.c')
-rw-r--r--kmodloader.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/kmodloader.c b/kmodloader.c
index b20de6e..065ac82 100644
--- a/kmodloader.c
+++ b/kmodloader.c
@@ -719,8 +719,15 @@ static int main_modprobe(int argc, char **argv)
{
struct module *m;
char *name;
+ char *mod = NULL;
+ int i;
- if (argc != 2)
+ for (i = 1; i < argc; i++)
+ if (argv[i][0] != '-') {
+ mod = argv[i];
+ break;
+ }
+ if (!mod)
return print_usage("modprobe");
if (scan_loaded_modules())
@@ -729,7 +736,7 @@ static int main_modprobe(int argc, char **argv)
if (scan_module_folders())
return -1;
- name = get_module_name(argv[1]);
+ name = get_module_name(mod);
m = find_module(name);
if (m && m->state == LOADED) {
ULOG_ERR("%s is already loaded\n", name);