char *name;
char *depends;
+ char *opts;
int size;
int usage;
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)
return NULL;
m->avl.key = m->name = strcpy(_name, name);
+ m->opts = 0;
if (depends) {
m->depends = strcpy(_dep, depends);
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;
data = malloc(s.st_size);
if (read(fd, data, s.st_size) == s.st_size)
- ret = syscall(__NR_init_module, data, s.st_size, options);
+ ret = syscall(__NR_init_module, data, (unsigned long) s.st_size, options);
else
LOG("failed to read full module %s\n", path);
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++;
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();