X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubox.git;a=blobdiff_plain;f=kmodloader.c;h=49899b3ade0ef5b418e60005135d107a6dd09266;hp=d72a1f452287e09a886792548eba24727e4e6778;hb=4e7f3e77e28863f23c1b43f667aa236cbc474c07;hpb=d6e6825c4697513d201fc3b146fb167c61404a04 diff --git a/kmodloader.c b/kmodloader.c index d72a1f4..49899b3 100644 --- a/kmodloader.c +++ b/kmodloader.c @@ -31,7 +31,9 @@ #include #include -#include +#include +#include +#include #define DEF_MOD_PATH "/lib/modules/%s/" @@ -43,7 +45,7 @@ enum { }; struct module { - struct list_head list; + struct avl_node avl; char *name; char *depends; @@ -53,36 +55,21 @@ struct module { int state; }; -static LIST_HEAD(modules); +static struct avl_tree modules; +static char *prefix = ""; -static struct module* find_module(char *name) +static struct module *find_module(const char *name) { - struct module *m = NULL; - - list_for_each_entry(m, &modules, list) - if (!strcmp(m->name, name)) - return m; - return NULL; -} - -static void free_module(struct module *m) -{ - if (m->name) - free(m->name); - if (m->depends) - free(m->depends); - free(m); + struct module *m; + return avl_find_element(&modules, name, m, avl); } static void free_modules(void) { - struct list_head *p, *n; + struct module *m, *tmp; - list_for_each_safe(p, n, &modules) { - struct module *m = container_of(p, struct module, list); - list_del(p); - free_module(m); - } + avl_remove_all_elements(&modules, m, avl, tmp) + free(m); } static char* get_module_path(char *name) @@ -96,7 +83,7 @@ static char* get_module_path(char *name) return name; uname(&ver); - snprintf(path, 256, DEF_MOD_PATH "%s.ko", ver.release, name); + snprintf(path, 256, "%s" DEF_MOD_PATH "%s.ko", prefix, ver.release, name); if (!stat(path, &s)) return path; @@ -108,7 +95,7 @@ static char* get_module_path(char *name) t++; } - snprintf(path, 256, DEF_MOD_PATH "%s.ko", ver.release, name); + snprintf(path, 256, "%s" DEF_MOD_PATH "%s.ko", prefix, ver.release, name); if (!stat(path, &s)) return path; @@ -182,17 +169,40 @@ static int elf_find_section(char *map, const char *section, unsigned int *offset } #endif +static struct module * +alloc_module(const char *name, const char *depends, int size) +{ + struct module *m; + char *_name, *_dep; + + m = calloc_a(sizeof(*m), + &_name, strlen(name) + 1, + &_dep, depends ? strlen(depends) + 1 : 0); + if (!m) + return NULL; + + m->avl.key = m->name = strcpy(_name, name); + if (depends) + m->depends = strcpy(_dep, depends); + + m->size = size; + avl_insert(&modules, &m->avl); + return m; +} + static int scan_loaded_modules(void) { - FILE *fp = fopen("/proc/modules", "r"); - char buf[256]; + size_t buf_len = 0; + char *buf = NULL; + FILE *fp; + fp = fopen("/proc/modules", "r"); if (!fp) { fprintf(stderr, "failed to open /proc/modules\n"); return -1; } - while (fgets(buf, sizeof(buf), fp)) { + while (getline(&buf, &buf_len, fp) > 0) { struct module m; struct module *n; @@ -204,27 +214,21 @@ static int scan_loaded_modules(void) if (!m.name || !m.depends) continue; - n = malloc(sizeof(struct module)); - if (!n) - continue; - - n->name = strdup(m.name); - n->depends = strdup(m.depends); - n->size = m.size; + n = alloc_module(m.name, m.depends, m.size); n->usage = m.usage; n->state = LOADED; - - list_add_tail(&n->list, &modules); } + free(buf); + fclose(fp); return 0; } -static struct module* get_module_info(char *module) +static struct module* get_module_info(const char *module, const char *name) { int fd = open(module, O_RDONLY); unsigned int offset, size; - char *map, *strings; + char *map, *strings, *dep = NULL; struct module *m; struct stat s; @@ -250,12 +254,6 @@ static struct module* get_module_info(char *module) } strings = map + offset; - m = malloc(sizeof(struct module)); - if (!m) - return NULL; - - memset(m, 0, sizeof(struct module)); - m->size = s.st_size; while (strings && (strings < map + offset + size)) { char *sep; int len; @@ -268,10 +266,14 @@ static struct module* get_module_info(char *module) len = sep - strings; sep++; if (!strncmp(strings, "depends=", len + 1)) - m->depends = strdup(sep); + dep = sep; strings = &sep[strlen(sep)]; } + m = alloc_module(name, dep, s.st_size); + if (!m) + return NULL; + m->state = SCANNED; return m; @@ -294,11 +296,8 @@ static int scan_module_folder(char *dir) continue; m = find_module(name); - if (!m) { - m = get_module_info(gl.gl_pathv[j]); - m->name = strdup(name); - list_add_tail(&m->list, &modules); - } + if (!m) + get_module_info(gl.gl_pathv[j], name); } globfree(&gl); @@ -422,7 +421,7 @@ static int load_depmod(void) do { loaded = 0; todo = 0; - list_for_each_entry(m, &modules, list) { + avl_for_each_element(&modules, m, avl) { if ((m->state == PROBE) && (!deps_available(m))) { if (!insert_module(get_module_path(m->name), "")) { m->state = LOADED; @@ -458,9 +457,8 @@ static int print_usage(char *arg) static int main_insmod(int argc, char **argv) { - char options[256] = ""; - char *name; - int i; + char *name, *cur, *options; + int i, ret, len; if (argc < 2) return print_insmod_usage(); @@ -482,13 +480,24 @@ static int main_insmod(int argc, char **argv) free_modules(); - for (i = 2; i < argc; i++) - if (snprintf(options, sizeof(options), "%s %s", options, argv[i]) >= sizeof(options)) { - fprintf(stderr, "argument line too long - %s\n", options); - return -1; + for (len = 0, i = 2; i < argc; i++) + len += strlen(argv[i]) + 1; + + options = malloc(len); + options[0] = 0; + cur = options; + for (i = 2; i < argc; i++) { + if (options[0]) { + *cur = ' '; + cur++; } + cur += sprintf(cur, "%s", argv[i]); + } - return insert_module(get_module_path(name), options); + ret = insert_module(get_module_path(name), options); + free(options); + + return ret; } static int main_rmmod(int argc, char **argv) @@ -526,7 +535,7 @@ static int main_lsmod(int argc, char **argv) if (scan_loaded_modules()) return -1; - list_for_each_entry(m, &modules, list) + avl_for_each_element(&modules, m, avl) if (m->state == LOADED) printf("%-20s%8d%3d %s\n", m->name, m->size, m->usage, @@ -559,7 +568,7 @@ static int main_depmod(int argc, char **argv) { struct utsname ver; struct module *m; - char path[128]; + char *path; char *name; if (argc != 2) @@ -569,7 +578,8 @@ static int main_depmod(int argc, char **argv) return -1; uname(&ver); - snprintf(path, sizeof(path), DEF_MOD_PATH "*.ko", ver.release); + path = alloca(sizeof(DEF_MOD_PATH "*.ko") + strlen(ver.release) + 1); + sprintf(path, DEF_MOD_PATH "*.ko", ver.release); scan_module_folder(path); @@ -596,45 +606,57 @@ static int main_loader(int argc, char **argv) char *dir = "/etc/modules.d/*"; glob_t gl; char *path; + int j; if (argc > 1) dir = argv[1]; + if (argc > 2) + prefix = argv[2]; + path = malloc(strlen(dir) + 2); strcpy(path, dir); strcat(path, "*"); + scan_loaded_modules(); + syslog(0, "kmodloader: loading kernel modules from %s\n", path); - if (glob(path, gl_flags, NULL, &gl) >= 0) { - int j; + if (glob(path, gl_flags, NULL, &gl) < 0) + goto out; - for (j = 0; j < gl.gl_pathc; j++) { - FILE *fp = fopen(gl.gl_pathv[j], "r"); + for (j = 0; j < gl.gl_pathc; j++) { + FILE *fp = fopen(gl.gl_pathv[j], "r"); + size_t mod_len = 0; + char *mod = NULL; - if (!fp) { - fprintf(stderr, "failed to open %s\n", gl.gl_pathv[j]); - } else { - char mod[256]; + if (!fp) { + fprintf(stderr, "failed to open %s\n", gl.gl_pathv[j]); + continue; + } - while (fgets(mod, sizeof(mod), fp)) { - char *nl = strchr(mod, '\n'); - char *opts; + while (getline(&mod, &mod_len, fp) > 0) { + char *nl = strchr(mod, '\n'); + struct module *m; + char *opts; - if (nl) - *nl = '\0'; + if (nl) + *nl = '\0'; - opts = strchr(mod, ' '); - if (opts) - *opts++ = '\0'; + opts = strchr(mod, ' '); + if (opts) + *opts++ = '\0'; - insert_module(get_module_path(mod), (opts) ? (opts) : ("")); - } - fclose(fp); - } + m = find_module(get_module_name(mod)); + if (m) + continue; + insert_module(get_module_path(mod), (opts) ? (opts) : ("")); } + free(mod); + fclose(fp); } +out: globfree(&gl); free(path); @@ -645,6 +667,7 @@ int main(int argc, char **argv) { char *exec = basename(*argv); + avl_init(&modules, avl_strcmp, false, NULL); if (!strcmp(exec, "insmod")) return main_insmod(argc, argv);