X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubox.git;a=blobdiff_plain;f=kmodloader.c;h=633570fd5b84bfe2b8cc1fb0b87fcc21ebc24c4d;hp=dee4b7c69eb4236402d31f821a55b3f0f98ec541;hb=89fa6427a27091dd501b66b9bcf009254abd7d80;hpb=8baea575d7314f36649e7c85a90715e199dc0f46

diff --git a/kmodloader.c b/kmodloader.c
index dee4b7c..633570f 100644
--- a/kmodloader.c
+++ b/kmodloader.c
@@ -55,6 +55,7 @@ struct module {
 
 	char *name;
 	char *depends;
+	char *opts;
 
 	int size;
 	int usage;
@@ -111,8 +112,7 @@ static char* get_module_name(char *path)
 	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;
@@ -133,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;
@@ -155,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)
@@ -170,6 +183,7 @@ 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);
@@ -284,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;
@@ -406,7 +420,7 @@ static int insert_module(char *path, const char *options)
 
 	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);
 
@@ -455,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++;
@@ -526,6 +540,13 @@ static int main_insmod(int argc, char **argv)
 		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);
 
@@ -553,13 +574,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;
 }
 
@@ -583,18 +604,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;
 }
@@ -698,6 +730,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();