char *name;
char *depends;
+ char *opts;
int size;
int usage;
static char path[256];
struct utsname ver;
struct stat s;
- char *t;
if (!stat(name, &s))
return name;
if (!stat(path, &s))
return path;
- t = name;
- while (t && *t) {
- if (*t == '_')
- *t = '-';
- t++;
- }
-
- snprintf(path, 256, "%s" DEF_MOD_PATH "%s.ko", prefix, ver.release, name);
-
- if (!stat(path, &s))
- return path;
-
return NULL;
}
t = strstr(name, ".ko");
if (t)
*t = '\0';
- t = name;
- while (t && *t) {
- if (*t == '-')
- *t = '_';
- t++;
- }
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;
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;
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)
m = calloc_a(sizeof(*m),
&_name, strlen(name) + 1,
- &_dep, depends ? strlen(depends) + 1 : 0);
+ &_dep, depends ? strlen(depends) + 2 : 0);
if (!m)
return NULL;
m->avl.key = m->name = strcpy(_name, name);
+ m->opts = 0;
- if (depends)
+ if (depends) {
m->depends = strcpy(_dep, depends);
+ while (*_dep) {
+ if (*_dep == ',')
+ *_dep = '\0';
+ _dep++;
+ }
+ }
m->size = size;
avl_insert(&modules, &m->avl);
+
return m;
}
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;
static int deps_available(struct module *m, int verbose)
{
- char *deps, *_deps;
- char *comma;
+ char *dep;
int err = 0;
if (!strcmp(m->depends, "-") || !strcmp(m->depends, ""))
return 0;
- _deps = deps = strdup(m->depends);
+ dep = m->depends;
- do {
- comma = strstr(deps, ",");
- if (comma)
- *comma = '\0';
-
- m = find_module(deps);
+ while (*dep) {
+ m = find_module(dep);
if (verbose && !m)
- LOG("missing dependency %s\n", deps);
+ LOG("missing dependency %s\n", dep);
if (verbose && m && (m->state != LOADED))
- LOG("dependency not loaded %s\n", deps);
+ LOG("dependency not loaded %s\n", dep);
if (!m || (m->state != LOADED))
err++;
- if (comma)
- deps = ++comma;
- } while (comma);
-
- free(_deps);
+ dep += strlen(dep) + 1;
+ }
return err;
}
static void load_moddeps(struct module *_m)
{
- char *deps, *_deps;
+ char *dep;
struct module *m;
- char *comma;
if (!strcmp(_m->depends, "-") || !strcmp(_m->depends, ""))
return;
- _deps = deps = strdup(_m->depends);
-
- do {
- char *t = deps;
-
- comma = strstr(deps, ",");
- if (comma)
- *comma = '\0';
+ dep = _m->depends;
- m = find_module(deps);
-
- if (!m) {
- while (t && *t) {
- if (*t == '-')
- *t = '_';
- t++;
- }
- m = find_module(deps);
- }
+ while (*dep) {
+ m = find_module(dep);
if (!m)
- LOG("failed to find dependency %s\n", deps);
+ LOG("failed to find dependency %s\n", dep);
if (m && (m->state != LOADED)) {
m->state = PROBE;
load_moddeps(m);
}
- if (comma)
- deps = ++comma;
- } while (comma);
-
- free(_deps);
+ dep = dep + strlen(dep) + 1;
+ }
}
+static int iterations = 0;
static int load_modprobe(void)
{
int loaded, todo;
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++;
if ((m->state == PROBE) || m->error)
todo++;
}
+ iterations++;
} while (loaded);
return todo;
cur += sprintf(cur, "%s", argv[i]);
}
+ if (get_module_path(argv[1])) {
+ name = argv[1];
+ } else 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);
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;
}
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;
}
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();
}
fail = load_modprobe();
+ LOG("ran %d iterations\n", iterations);
if (fail) {
LOG("%d module%s could not be probed\n",
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);