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>

diff --git a/kmodloader.c b/kmodloader.c
index b20de6e447905e156ae8093f1a393ee91ea4d857..065ac82cccbc4a96fa5a744a42ff95de8c9c0d78 100644 (file)
--- 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);