validate: range and base arguments for numeric types, new types hexstring, regexp...

[project/ubox.git] / kmodloader.c

diff --git a/kmodloader.c b/kmodloader.c
index 9fd5ae4..db4574e 100644 (file)
--- a/kmodloader.c
+++ b/kmodloader.c
@@ -55,6 +55,7 @@ struct module {
 
        char *name;
        char *depends;
+       char *opts;
 
        int size;
        int usage;
@@ -79,26 +80,6 @@ static void free_modules(void)
                free(m);
 }
 
-static void replace_dash(char *s)
-{
-       if (*s == '-')
-               return;
-       while (s && *s) {
-               if (*s == '-')
-                       *s = '_';
-               s++;
-       }
-}
-
-static void replace_underscore(char *s)
-{
-       while (s && *s) {
-               if (*s == '_')
-                       *s = '-';
-               s++;
-       }
-}
-
 static char* get_module_path(char *name)
 {
        static char path[256];
@@ -110,13 +91,6 @@ static char* get_module_path(char *name)
 
        uname(&ver);
        snprintf(path, 256, "%s" DEF_MOD_PATH "%s.ko", prefix, ver.release, name);
-       replace_dash(path);
-
-       if (!stat(path, &s))
-               return path;
-
-       snprintf(path, 256, "%s" DEF_MOD_PATH "%s.ko", prefix, ver.release, name);
-       replace_underscore(path);
 
        if (!stat(path, &s))
                return path;
@@ -134,13 +108,11 @@ static char* get_module_name(char *path)
        t = strstr(name, ".ko");
        if (t)
                *t = '\0';
-        replace_dash(name);
 
        return name;
 }
 
-#if __WORDSIZE == 64
-static int elf_find_section(char *map, const char *section, unsigned int *offset, unsigned int *size)
+static int elf64_find_section(char *map, const char *section, unsigned int *offset, unsigned int *size)
 {
        const char *secnames;
        Elf64_Ehdr *e;
@@ -161,8 +133,8 @@ static int elf_find_section(char *map, const char *section, unsigned int *offset
 
        return -1;
 }
-#else
-static int elf_find_section(char *map, const char *section, unsigned int *offset, unsigned int *size)
+
+static int elf32_find_section(char *map, const char *section, unsigned int *offset, unsigned int *size)
 {
        const char *secnames;
        Elf32_Ehdr *e;
@@ -183,7 +155,20 @@ static int elf_find_section(char *map, const char *section, unsigned int *offset
 
        return -1;
 }
-#endif
+
+static int elf_find_section(char *map, const char *section, unsigned int *offset, unsigned int *size)
+{
+       int clazz = map[EI_CLASS];
+
+       if (clazz == ELFCLASS32)
+               return elf32_find_section(map, section, offset, size);
+       else if (clazz == ELFCLASS64)
+               return elf64_find_section(map, section, offset, size);
+
+       LOG("unknown elf format %d\n", clazz);
+
+       return -1;
+}
 
 static struct module *
 alloc_module(const char *name, const char *depends, int size)
@@ -198,11 +183,10 @@ alloc_module(const char *name, const char *depends, int size)
                return NULL;
 
        m->avl.key = m->name = strcpy(_name, name);
-       replace_dash(_name);
+       m->opts = 0;
 
        if (depends) {
                m->depends = strcpy(_dep, depends);
-               replace_dash(_dep);
                while (*_dep) {
                        if (*_dep == ',')
                                *_dep = '\0';
@@ -314,8 +298,8 @@ static int scan_module_folder(void)
        int j;
 
        uname(&ver);
-       path = alloca(sizeof(DEF_MOD_PATH "*.ko") + strlen(ver.release) + 1);
-       sprintf(path, DEF_MOD_PATH "*.ko", ver.release);
+       path = alloca(sizeof(DEF_MOD_PATH "*.ko") + strlen(prefix) + strlen(ver.release) + 1);
+       sprintf(path, "%s" DEF_MOD_PATH "*.ko", prefix, ver.release);
 
        if (glob(path, gl_flags, NULL, &gl) < 0)
                return -1;
@@ -485,7 +469,7 @@ static int load_modprobe(void)
                todo = 0;
                avl_for_each_element(&modules, m, avl) {
                        if ((m->state == PROBE) && (!deps_available(m, 0))) {
-                               if (!insert_module(get_module_path(m->name), "")) {
+                               if (!insert_module(get_module_path(m->name), (m->opts) ? (m->opts) : (""))) {
                                        m->state = LOADED;
                                        m->error = 0;
                                        loaded++;
@@ -556,6 +540,11 @@ static int main_insmod(int argc, char **argv)
                cur += sprintf(cur, "%s", argv[i]);
        }
 
+       if (!get_module_path(name)) {
+               fprintf(stderr, "Failed to find %s. Maybe it is a built in module ?\n", name);
+               return -1;
+       }
+
        ret = insert_module(get_module_path(name), options);
        free(options);
 
@@ -583,13 +572,13 @@ static int main_rmmod(int argc, char **argv)
                LOG("module is not loaded\n");
                return -1;
        }
-       free_modules();
-
-       ret = syscall(__NR_delete_module, name, 0);
+       ret = syscall(__NR_delete_module, m->name, 0);
 
        if (ret)
                LOG("unloading the module failed\n");
 
+       free_modules();
+
        return ret;
 }
 
@@ -613,18 +602,29 @@ static int main_lsmod(int argc, char **argv)
 
 static int main_modinfo(int argc, char **argv)
 {
-       char *module;
+       struct module *m;
+       char *name;
 
        if (argc != 2)
                return print_usage("modinfo");
 
-       module = get_module_path(argv[1]);
-       if (!module) {
+       if (scan_module_folder())
+               return -1;
+
+       name = get_module_name(argv[1]);
+       m = find_module(name);
+       if (!m) {
                LOG("cannot find module - %s\n", argv[1]);
                return -1;
        }
 
-       print_modinfo(module);
+       name = get_module_path(m->name);
+       if (!name) {
+               LOG("cannot find path of module - %s\n", m->name);
+               return -1;
+       }
+
+       print_modinfo(name);
 
        return 0;
 }
@@ -728,6 +728,8 @@ static int main_loader(int argc, char **argv)
                        if (!m || (m->state == LOADED))
                                continue;
 
+                       if (opts)
+                               m->opts = strdup(opts);
                        m->state = PROBE;
                        if (basename(gl.gl_pathv[j])[0] - '0' <= 9)
                                load_modprobe();
@@ -756,11 +758,27 @@ out:
        return 0;
 }
 
+static int avl_modcmp(const void *k1, const void *k2, void *ptr)
+{
+       const char *s1 = k1;
+       const char *s2 = k2;
+
+       while (*s1 && ((*s1 == *s2) ||
+                      ((*s1 == '_') && (*s2 == '-')) ||
+                      ((*s1 == '-') && (*s2 == '_'))))
+       {
+               s1++;
+               s2++;
+       }
+
+       return *(const unsigned char *)s1 - *(const unsigned char *)s2;
+}
+
 int main(int argc, char **argv)
 {
        char *exec = basename(*argv);
 
-       avl_init(&modules, avl_strcmp, false, NULL);
+       avl_init(&modules, avl_modcmp, false, NULL);
        if (!strcmp(exec, "insmod"))
                return main_insmod(argc, argv);