X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubox.git;a=blobdiff_plain;f=kmodloader.c;h=04d7c1d307c8fa14ab09d5199c822ea518b07053;hp=f45f3dc0883827c705b2271b2d8639aee1fbb830;hb=de1dc9d1dc652171b2c019760701fa2283faacde;hpb=bf2483023b3f99c0a74f96fb3cdab5a0c0ef3081

diff --git a/kmodloader.c b/kmodloader.c
index f45f3dc..04d7c1d 100644
--- a/kmodloader.c
+++ b/kmodloader.c
@@ -38,10 +38,17 @@
 
 #define DEF_MOD_PATH "/lib/modules/%s/"
 
-#define LOG(fmt, ...) do { \
+#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 {
@@ -55,6 +62,7 @@ struct module {
 
 	char *name;
 	char *depends;
+	char *opts;
 
 	int size;
 	int usage;
@@ -79,24 +87,6 @@ static void free_modules(void)
 		free(m);
 }
 
-static void replace_dash(char *s)
-{
-	while (s && *s) {
-		if (*s == '-')
-			*s = '_';
-		s++;
-	}
-}
-
-static void replace_underscore(char *s)
-{
-	while (s && *s) {
-		if (*s == '_')
-			*s = '-';
-		s++;
-	}
-}
-
 static char* get_module_path(char *name)
 {
 	static char path[256];
@@ -108,13 +98,6 @@ static char* get_module_path(char *name)
 
 	uname(&ver);
 	snprintf(path, 256, "%s" DEF_MOD_PATH "%s.ko", prefix, ver.release, name);
-	replace_dash(path);
-
-	if (!stat(path, &s))
-		return path;
-
-	snprintf(path, 256, "%s" DEF_MOD_PATH "%s.ko", prefix, ver.release, name);
-	replace_underscore(path);
 
 	if (!stat(path, &s))
 		return path;
@@ -132,13 +115,11 @@ static char* get_module_name(char *path)
 	t = strstr(name, ".ko");
 	if (t)
 		*t = '\0';
-        replace_dash(name);
 
 	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;
@@ -159,8 +140,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;
@@ -181,7 +162,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);
+
+	ERROR("unknown elf format %d\n", clazz);
+
+	return -1;
+}
 
 static struct module *
 alloc_module(const char *name, const char *depends, int size)
@@ -196,11 +190,10 @@ alloc_module(const char *name, const char *depends, int size)
 		return NULL;
 
 	m->avl.key = m->name = strcpy(_name, name);
-	replace_dash(_name);
+	m->opts = 0;
 
 	if (depends) {
 		m->depends = strcpy(_dep, depends);
-		replace_dash(_dep);
 		while (*_dep) {
 			if (*_dep == ',')
 				*_dep = '\0';
@@ -222,7 +215,7 @@ static int scan_loaded_modules(void)
 
 	fp = fopen("/proc/modules", "r");
 	if (!fp) {
-		LOG("failed to open /proc/modules\n");
+		ERROR("failed to open /proc/modules\n");
 		return -1;
 	}
 
@@ -257,23 +250,23 @@ static struct module* get_module_info(const char *module, const char *name)
 	struct stat s;
 
 	if (!fd) {
-		LOG("failed to open %s\n", module);
+		ERROR("failed to open %s\n", module);
 		return NULL;
 	}
 
 	if (fstat(fd, &s) == -1) {
-		LOG("failed to stat %s\n", module);
+		ERROR("failed to stat %s\n", module);
 		return NULL;
 	}
 
 	map = mmap(NULL, s.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
 	if (map == MAP_FAILED) {
-		LOG("failed to mmap %s\n", module);
+		ERROR("failed to mmap %s\n", module);
 		return NULL;
 	}
 
 	if (elf_find_section(map, ".modinfo", &offset, &size)) {
-		LOG("failed to load the .modinfo section from %s\n", module);
+		ERROR("failed to load the .modinfo section from %s\n", module);
 		return NULL;
 	}
 
@@ -312,8 +305,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;
@@ -343,23 +336,23 @@ static int print_modinfo(char *module)
 	char *map, *strings;
 
 	if (!fd) {
-		LOG("failed to open %s\n", module);
+		ERROR("failed to open %s\n", module);
 		return -1;
 	}
 
 	if (fstat(fd, &s) == -1) {
-		LOG("failed to stat %s\n", module);
+		ERROR("failed to stat %s\n", module);
 		return -1;
 	}
 
 	map = mmap(NULL, s.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
 	if (map == MAP_FAILED) {
-		LOG("failed to mmap %s\n", module);
+		ERROR("failed to mmap %s\n", module);
 		return -1;
 	}
 
 	if (elf_find_section(map, ".modinfo", &offset, &size)) {
-		LOG("failed to load the .modinfo section from %s\n", module);
+		ERROR("failed to load the .modinfo section from %s\n", module);
 		return -1;
 	}
 
@@ -395,7 +388,7 @@ static int deps_available(struct module *m, int verbose)
 	char *dep;
 	int err = 0;
 
-	if (!strcmp(m->depends, "_") || !strcmp(m->depends, ""))
+	if (!strcmp(m->depends, "-") || !strcmp(m->depends, ""))
 		return 0;
 
 	dep = m->depends;
@@ -404,9 +397,9 @@ static int deps_available(struct module *m, int verbose)
 		m = find_module(dep);
 
 		if (verbose && !m)
-			LOG("missing dependency %s\n", dep);
+			ERROR("missing dependency %s\n", dep);
 		if (verbose && m && (m->state != LOADED))
-			LOG("dependency not loaded %s\n", dep);
+			ERROR("dependency not loaded %s\n", dep);
 		if (!m || (m->state != LOADED))
 			err++;
 		dep += strlen(dep) + 1;
@@ -422,21 +415,21 @@ static int insert_module(char *path, const char *options)
 	int fd, ret = -1;
 
 	if (stat(path, &s)) {
-		LOG("missing module %s\n", path);
+		ERROR("missing module %s\n", path);
 		return ret;
 	}
 
 	fd = open(path, O_RDONLY);
 	if (!fd) {
-		LOG("cannot open %s\n", path);
+		ERROR("cannot open %s\n", path);
 		return ret;
 	}
 
 	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);
+		ERROR("failed to read full module %s\n", path);
 
 	close(fd);
 	free(data);
@@ -449,7 +442,7 @@ static void load_moddeps(struct module *_m)
 	char *dep;
 	struct module *m;
 
-	if (!strcmp(_m->depends, "_") || !strcmp(_m->depends, ""))
+	if (!strcmp(_m->depends, "-") || !strcmp(_m->depends, ""))
 		return;
 
 	dep = _m->depends;
@@ -458,7 +451,7 @@ static void load_moddeps(struct module *_m)
 		m = find_module(dep);
 
 		if (!m)
-			LOG("failed to find dependency %s\n", dep);
+			ERROR("failed to find dependency %s\n", dep);
 		if (m && (m->state != LOADED)) {
 			m->state = PROBE;
 			load_moddeps(m);
@@ -483,7 +476,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++;
@@ -503,14 +496,14 @@ static int load_modprobe(void)
 
 static int print_insmod_usage(void)
 {
-	LOG("Usage:\n\tinsmod filename [args]\n");
+	INFO("Usage:\n\tinsmod filename [args]\n");
 
 	return -1;
 }
 
 static int print_usage(char *arg)
 {
-	LOG("Usage:\n\t%s module\n", arg);
+	INFO("Usage:\n\t%s module\n", arg);
 
 	return -1;
 }
@@ -525,7 +518,7 @@ static int main_insmod(int argc, char **argv)
 
 	name = get_module_name(argv[1]);
 	if (!name) {
-		LOG("cannot find module - %s\n", argv[1]);
+		ERROR("cannot find module - %s\n", argv[1]);
 		return -1;
 	}
 
@@ -533,7 +526,7 @@ static int main_insmod(int argc, char **argv)
 		return -1;
 
 	if (find_module(name)) {
-		LOG("module is already loaded - %s\n", name);
+		ERROR("module is already loaded - %s\n", name);
 		return -1;
 
 	}
@@ -554,11 +547,18 @@ 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);
 
 	if (ret)
-		LOG("failed to insert %s\n", get_module_path(name));
+		ERROR("failed to insert %s\n", get_module_path(name));
 
 	return ret;
 }
@@ -578,15 +578,15 @@ static int main_rmmod(int argc, char **argv)
 	name = get_module_name(argv[1]);
 	m = find_module(name);
 	if (!m) {
-		LOG("module is not loaded\n");
+		ERROR("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");
+		ERROR("unloading the module failed\n");
+
+	free_modules();
 
 	return ret;
 }
@@ -611,18 +611,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) {
-		LOG("cannot find module - %s\n", argv[1]);
+	if (scan_module_folder())
+		return -1;
+
+	name = get_module_name(argv[1]);
+	m = find_module(name);
+	if (!m) {
+		ERROR("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);
 		return -1;
 	}
 
-	print_modinfo(module);
+	print_modinfo(name);
 
 	return 0;
 }
@@ -644,10 +655,10 @@ static int main_modprobe(int argc, char **argv)
 	name = get_module_name(argv[1]);
 	m = find_module(name);
 	if (m && m->state == LOADED) {
-		LOG("%s is already loaded\n", name);
+		ERROR("%s is already loaded\n", name);
 		return -1;
 	} else if (!m) {
-		LOG("failed to find a module named %s\n", name);
+		ERROR("failed to find a module named %s\n", name);
 	} else {
 		int fail;
 
@@ -656,12 +667,12 @@ static int main_modprobe(int argc, char **argv)
 		fail = load_modprobe();
 
 		if (fail) {
-			LOG("%d module%s could not be probed\n",
+			ERROR("%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)
-					LOG("- %s\n", m->name);
+					ERROR("- %s\n", m->name);
 		}
 	}
 
@@ -706,7 +717,7 @@ static int main_loader(int argc, char **argv)
 		char *mod = NULL;
 
 		if (!fp) {
-			LOG("failed to open %s\n", gl.gl_pathv[j]);
+			ERROR("failed to open %s\n", gl.gl_pathv[j]);
 			continue;
 		}
 
@@ -726,6 +737,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();
@@ -736,15 +749,15 @@ static int main_loader(int argc, char **argv)
 	}
 
 	fail = load_modprobe();
-	LOG("ran %d iterations\n", iterations);
+	DEBUG("ran %d iterations\n", iterations);
 
 	if (fail) {
-		LOG("%d module%s could not be probed\n",
+		ERROR("%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))
-				LOG("- %s - %d\n", m->name, deps_available(m, 1));
+				ERROR("- %s - %d\n", m->name, deps_available(m, 1));
 	}
 
 out:
@@ -754,11 +767,27 @@ out:
 	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);