X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubox.git;a=blobdiff_plain;f=kmodloader.c;h=5ba75c1aa36d24282991708c8bca019b5faa03ac;hp=4300bafc3314bcf65805dceb3b18d17a3b0cc197;hb=5649c028c426060616e2bd4e7ea83271cd333d21;hpb=31f0ff358b360ee461d845c1b3b5e5d38fa27925 diff --git a/kmodloader.c b/kmodloader.c index 4300baf..5ba75c1 100644 --- a/kmodloader.c +++ b/kmodloader.c @@ -35,22 +35,10 @@ #include #include #include +#include #define DEF_MOD_PATH "/modules/%s/" -#define INFO(fmt, ...) do { \ - syslog(LOG_INFO, fmt, ## __VA_ARGS__); \ - printf("kmod: "fmt, ## __VA_ARGS__); \ - } while (0) -#define ERROR(fmt, ...) do { \ - syslog(LOG_ERR, fmt, ## __VA_ARGS__); \ - fprintf(stderr,"kmod: "fmt, ## __VA_ARGS__); \ - } while (0) -#define DEBUG(fmt, ...) do { \ - syslog(LOG_DEBUG, fmt, ## __VA_ARGS__); \ - } while (0) - - enum { SCANNED, PROBE, @@ -216,7 +204,7 @@ static int elf_find_section(char *map, const char *section, unsigned int *offset else if (clazz == ELFCLASS64) return elf64_find_section(map, section, offset, size); - ERROR("unknown elf format %d\n", clazz); + ULOG_ERR("unknown elf format %d\n", clazz); return -1; } @@ -259,7 +247,7 @@ static int scan_loaded_modules(void) fp = fopen("/proc/modules", "r"); if (!fp) { - ERROR("failed to open /proc/modules\n"); + ULOG_ERR("failed to open /proc/modules\n"); return -1; } @@ -289,29 +277,29 @@ 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, *dep = NULL; - struct module *m; + char *map = MAP_FAILED, *strings, *dep = NULL; + struct module *m = NULL; struct stat s; - if (!fd) { - ERROR("failed to open %s\n", module); - return NULL; + if (fd < 0) { + ULOG_ERR("failed to open %s\n", module); + goto out; } if (fstat(fd, &s) == -1) { - ERROR("failed to stat %s\n", module); - return NULL; + ULOG_ERR("failed to stat %s\n", module); + goto out; } map = mmap(NULL, s.st_size, PROT_READ, MAP_PRIVATE, fd, 0); if (map == MAP_FAILED) { - ERROR("failed to mmap %s\n", module); - return NULL; + ULOG_ERR("failed to mmap %s\n", module); + goto out; } if (elf_find_section(map, ".modinfo", &offset, &size)) { - ERROR("failed to load the .modinfo section from %s\n", module); - return NULL; + ULOG_ERR("failed to load the .modinfo section from %s\n", module); + goto out; } strings = map + offset; @@ -332,10 +320,16 @@ static struct module* get_module_info(const char *module, const char *name) } m = alloc_module(name, dep, s.st_size); - if (!m) - return NULL; - m->state = SCANNED; + if (m) + m->state = SCANNED; + +out: + if (map != MAP_FAILED) + munmap(map, s.st_size); + + if (fd >= 0) + close(fd); return m; } @@ -391,27 +385,28 @@ static int print_modinfo(char *module) int fd = open(module, O_RDONLY); unsigned int offset, size; struct stat s; - char *map, *strings; + char *map = MAP_FAILED, *strings; + int rv = -1; - if (!fd) { - ERROR("failed to open %s\n", module); - return -1; + if (fd < 0) { + ULOG_ERR("failed to open %s\n", module); + goto out; } if (fstat(fd, &s) == -1) { - ERROR("failed to stat %s\n", module); - return -1; + ULOG_ERR("failed to stat %s\n", module); + goto out; } map = mmap(NULL, s.st_size, PROT_READ, MAP_PRIVATE, fd, 0); if (map == MAP_FAILED) { - ERROR("failed to mmap %s\n", module); - return -1; + ULOG_ERR("failed to mmap %s\n", module); + goto out; } if (elf_find_section(map, ".modinfo", &offset, &size)) { - ERROR("failed to load the .modinfo section from %s\n", module); - return -1; + ULOG_ERR("failed to load the .modinfo section from %s\n", module); + goto out; } strings = map + offset; @@ -438,7 +433,16 @@ static int print_modinfo(char *module) free(dup); } - return 0; + rv = 0; + +out: + if (map != MAP_FAILED) + munmap(map, s.st_size); + + if (fd >= 0) + close(fd); + + return rv; } static int deps_available(struct module *m, int verbose) @@ -446,7 +450,7 @@ static int deps_available(struct module *m, int verbose) char *dep; int err = 0; - if (!strcmp(m->depends, "-") || !strcmp(m->depends, "")) + if (!m->depends || !strcmp(m->depends, "-") || !strcmp(m->depends, "")) return 0; dep = m->depends; @@ -455,9 +459,9 @@ static int deps_available(struct module *m, int verbose) m = find_module(dep); if (verbose && !m) - ERROR("missing dependency %s\n", dep); + ULOG_ERR("missing dependency %s\n", dep); if (verbose && m && (m->state != LOADED)) - ERROR("dependency not loaded %s\n", dep); + ULOG_ERR("dependency not loaded %s\n", dep); if (!m || (m->state != LOADED)) err++; dep += strlen(dep) + 1; @@ -473,13 +477,13 @@ static int insert_module(char *path, const char *options) int fd, ret = -1; if (stat(path, &s)) { - ERROR("missing module %s\n", path); + ULOG_ERR("missing module %s\n", path); return ret; } fd = open(path, O_RDONLY); - if (!fd) { - ERROR("cannot open %s\n", path); + if (fd < 0) { + ULOG_ERR("cannot open %s\n", path); return ret; } @@ -487,7 +491,7 @@ static int insert_module(char *path, const char *options) if (read(fd, data, s.st_size) == s.st_size) ret = syscall(__NR_init_module, data, (unsigned long) s.st_size, options); else - ERROR("failed to read full module %s\n", path); + ULOG_ERR("failed to read full module %s\n", path); close(fd); free(data); @@ -509,7 +513,7 @@ static void load_moddeps(struct module *_m) m = find_module(dep); if (!m) - ERROR("failed to find dependency %s\n", dep); + ULOG_ERR("failed to find dependency %s\n", dep); if (m && (m->state != LOADED)) { m->state = PROBE; load_moddeps(m); @@ -554,14 +558,14 @@ static int load_modprobe(void) static int print_insmod_usage(void) { - INFO("Usage:\n\tinsmod filename [args]\n"); + ULOG_INFO("Usage:\n\tinsmod filename [args]\n"); return -1; } static int print_usage(char *arg) { - INFO("Usage:\n\t%s module\n", arg); + ULOG_INFO("Usage:\n\t%s module\n", arg); return -1; } @@ -576,7 +580,7 @@ static int main_insmod(int argc, char **argv) name = get_module_name(argv[1]); if (!name) { - ERROR("cannot find module - %s\n", argv[1]); + ULOG_ERR("cannot find module - %s\n", argv[1]); return -1; } @@ -584,7 +588,7 @@ static int main_insmod(int argc, char **argv) return -1; if (find_module(name)) { - ERROR("module is already loaded - %s\n", name); + ULOG_ERR("module is already loaded - %s\n", name); return -1; } @@ -605,6 +609,11 @@ static int main_insmod(int argc, char **argv) cur += sprintf(cur, "%s", argv[i]); } + if (init_module_folders()) { + fprintf(stderr, "falied to find the folder holding the modules\n"); + return -1; + } + if (get_module_path(argv[1])) { name = argv[1]; } else if (!get_module_path(name)) { @@ -616,7 +625,7 @@ static int main_insmod(int argc, char **argv) free(options); if (ret) - ERROR("failed to insert %s\n", get_module_path(name)); + ULOG_ERR("failed to insert %s\n", get_module_path(name)); return ret; } @@ -636,13 +645,13 @@ static int main_rmmod(int argc, char **argv) name = get_module_name(argv[1]); m = find_module(name); if (!m) { - ERROR("module is not loaded\n"); + ULOG_ERR("module is not loaded\n"); return -1; } ret = syscall(__NR_delete_module, m->name, 0); if (ret) - ERROR("unloading the module failed\n"); + ULOG_ERR("unloading the module failed\n"); free_modules(); @@ -652,15 +661,26 @@ static int main_rmmod(int argc, char **argv) static int main_lsmod(int argc, char **argv) { struct module *m; + char *dep; if (scan_loaded_modules()) return -1; avl_for_each_element(&modules, m, avl) - if (m->state == LOADED) - printf("%-20s%8d%3d %s\n", - m->name, m->size, m->usage, - (*m->depends == '-') ? ("") : (m->depends)); + if (m->state == LOADED) { + printf("%-20s%8d%3d ", + m->name, m->size, m->usage); + if (m->depends && strcmp(m->depends, "-") && strcmp(m->depends, "")) { + dep = m->depends; + while (*dep) { + printf("%s", dep); + dep = dep + strlen(dep) + 1; + if (*dep) + printf(","); + } + } + printf("\n"); + } free_modules(); @@ -681,13 +701,13 @@ static int main_modinfo(int argc, char **argv) name = get_module_name(argv[1]); m = find_module(name); if (!m) { - ERROR("cannot find module - %s\n", argv[1]); + ULOG_ERR("cannot find module - %s\n", argv[1]); return -1; } name = get_module_path(m->name); if (!name) { - ERROR("cannot find path of module - %s\n", m->name); + ULOG_ERR("cannot find path of module - %s\n", m->name); return -1; } @@ -713,10 +733,10 @@ static int main_modprobe(int argc, char **argv) name = get_module_name(argv[1]); m = find_module(name); if (m && m->state == LOADED) { - ERROR("%s is already loaded\n", name); + ULOG_ERR("%s is already loaded\n", name); return -1; } else if (!m) { - ERROR("failed to find a module named %s\n", name); + ULOG_ERR("failed to find a module named %s\n", name); } else { int fail; @@ -725,12 +745,12 @@ static int main_modprobe(int argc, char **argv) fail = load_modprobe(); if (fail) { - ERROR("%d module%s could not be probed\n", - fail, (fail == 1) ? ("") : ("s")); + ULOG_ERR("%d module%s could not be probed\n", + fail, (fail == 1) ? ("") : ("s")); avl_for_each_element(&modules, m, avl) if ((m->state == PROBE) || m->error) - ERROR("- %s\n", m->name); + ULOG_ERR("- %s\n", m->name); } } @@ -761,7 +781,7 @@ static int main_loader(int argc, char **argv) if (scan_module_folders()) return -1; - syslog(0, "kmodloader: loading kernel modules from %s\n", path); + syslog(LOG_INFO, "kmodloader: loading kernel modules from %s\n", path); if (glob(path, gl_flags, NULL, &gl) < 0) goto out; @@ -772,7 +792,7 @@ static int main_loader(int argc, char **argv) char *mod = NULL; if (!fp) { - ERROR("failed to open %s\n", gl.gl_pathv[j]); + ULOG_ERR("failed to open %s\n", gl.gl_pathv[j]); continue; } @@ -804,15 +824,14 @@ static int main_loader(int argc, char **argv) } fail = load_modprobe(); - DEBUG("ran %d iterations\n", iterations); if (fail) { - ERROR("%d module%s could not be probed\n", - fail, (fail == 1) ? ("") : ("s")); + ULOG_ERR("%d module%s could not be probed\n", + fail, (fail == 1) ? ("") : ("s")); avl_for_each_element(&modules, m, avl) if ((m->state == PROBE) || (m->error)) - ERROR("- %s - %d\n", m->name, deps_available(m, 1)); + ULOG_ERR("- %s - %d\n", m->name, deps_available(m, 1)); } out: