aboutsummaryrefslogtreecommitdiffstats
path: root/package/busybox/patches/470-insmod_search.patch
blob: ef372ecccf0930f9113cd755288085b823417941 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
Index: busybox-1.8.1/modutils/insmod.c
===================================================================
--- busybox-1.8.1.orig/modutils/insmod.c	2007-11-10 02:40:49.000000000 +0100
+++ busybox-1.8.1/modutils/insmod.c	2007-11-10 17:28:44.391223047 +0100
@@ -61,21 +61,117 @@
 #include "libbb.h"
 #include <libgen.h>
 #include <sys/utsname.h>
+#if ENABLE_FEATURE_2_6_MODULES
+#include <sys/mman.h>
+#include <asm/unistd.h>
+#include <sys/syscall.h>
+#endif
 
 #if !ENABLE_FEATURE_2_4_MODULES && !ENABLE_FEATURE_2_6_MODULES
 #undef ENABLE_FEATURE_2_4_MODULES
 #define ENABLE_FEATURE_2_4_MODULES 1
 #endif
 
-/*
- * Big piece of 2.4-specific code
- */
 #if ENABLE_FEATURE_2_4_MODULES
-
+int insmod_main_24(int argc, char **argv);
+#endif
 #if ENABLE_FEATURE_2_6_MODULES
-static int insmod_ng_main(int argc, char **argv);
+int insmod_main_26(int argc, char **argv);
+#endif
+int insmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+
+static char *g_filename = NULL;
+#define _PATH_MODULES	"/lib/modules"
+
+static int check_module_name_match(const char *filename, struct stat *statbuf,
+				   void *userdata, int depth)
+{
+	char *fullname = (char *) userdata;
+	char *tmp;
+
+	if (fullname[0] == '\0')
+		return FALSE;
+
+	tmp = bb_get_last_path_component_nostrip(filename);
+	if (strcmp(tmp, fullname) == 0) {
+		/* Stop searching if we find a match */
+		g_filename = xstrdup(filename);
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+static int find_module(char *filename)
+{
+	char *module_dir, real_module_dir[FILENAME_MAX];
+	int len, slen, ret = ENOENT, k_version;
+	struct utsname myuname;
+	const char *suffix;
+	struct stat st;
+
+	/* check the kernel version */
+	if ((uname(&myuname) != 0) || (myuname.release[0] != '2'))
+		return EINVAL;
+
+	k_version = myuname.release[2] - '0';
+#if ENABLE_FEATURE_2_4_MODULES
+	if (k_version <= 4)
+		suffix = ".o";
+	else
 #endif
+		suffix = ".ko";
+
+	len = strlen(filename);
+	slen = strlen(suffix);
+
+	/* check for suffix and absolute path first */
+	if ((len < slen + 2) || (strcmp(filename + len - slen, suffix) != 0)) {
+		filename = xasprintf("%s%s", filename, suffix);
+	} else {
+		filename = strdup(filename);
+		if ((stat(filename, &st) == 0) && S_ISREG(st.st_mode)) {
+			g_filename = filename;
+			return 0;
+		}
+		free(filename);
+		return ENOENT;
+	}
+
+	/* next: scan /lib/modules/<release> */
+	/* Jump through hoops in case /lib/modules/`uname -r`
+	* is a symlink.  We do not want recursive_action to
+	* follow symlinks, but we do want to follow the
+	* /lib/modules/`uname -r` dir, So resolve it ourselves
+	* if it is a link... */
+	module_dir = concat_path_file(_PATH_MODULES, myuname.release);
+	if (realpath(module_dir, real_module_dir) != NULL) {
+		free(module_dir);
+		module_dir = real_module_dir;
+	}
+
+	recursive_action(module_dir, ACTION_RECURSE,
+		check_module_name_match, 0, filename, 0);
+
+	/* Check if we have a complete path */
+	if (g_filename == NULL)
+		goto done;
+
+	if ((stat(g_filename, &st) == 0) && S_ISREG(st.st_mode))
+		ret = 0;
+	else
+		free(g_filename);
 
+done:
+	free(filename);
+
+	return ret;
+}
+
+/*
+ * Big piece of 2.4-specific code
+ */
+#if ENABLE_FEATURE_2_4_MODULES
 #if ENABLE_FEATURE_INSMOD_LOADINKMEM
 #define LOADBITS 0
 #else
@@ -673,7 +769,6 @@
 #endif
 
 
-#define _PATH_MODULES	"/lib/modules"
 enum { STRVERSIONLEN = 64 };
 
 /*======================================================================*/
@@ -789,27 +884,6 @@
 static char *m_fullName;
 
 
-/*======================================================================*/
-
-
-static int check_module_name_match(const char *filename, struct stat *statbuf,
-				void *userdata, int depth)
-{
-	char *fullname = (char *) userdata;
-	char *tmp;
-
-	if (fullname[0] == '\0')
-		return FALSE;
-
-	tmp = bb_get_last_path_component_nostrip(filename);
-	if (strcmp(tmp, fullname) == 0) {
-		/* Stop searching if we find a match */
-		m_filename = xstrdup(filename);
-		return FALSE;
-	}
-	return TRUE;
-}
-
 
 /*======================================================================*/
 
@@ -3897,145 +3971,57 @@
 void print_load_map(struct obj_file *f);
 #endif
 
-int insmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int insmod_main(int argc, char **argv)
+int insmod_main_24( int argc, char **argv)
 {
 	char *opt_o, *arg1;
-	int len;
 	int k_crcs;
-	char *tmp, *tmp1;
 	unsigned long m_size;
 	ElfW(Addr) m_addr;
 	struct obj_file *f;
-	struct stat st;
-	char *m_name = NULL;
-	int exit_status = EXIT_FAILURE;
+	char *tmp = NULL, *m_name = NULL;
+	int ret = EINVAL;
 	int m_has_modinfo;
 #if ENABLE_FEATURE_INSMOD_VERSION_CHECKING
 	struct utsname uts_info;
 	char m_strversion[STRVERSIONLEN];
 	int m_version, m_crcs;
 #endif
-#if ENABLE_FEATURE_CLEAN_UP
 	FILE *fp = NULL;
-#else
-	FILE *fp;
-#endif
-	int k_version = 0;
+	int k_version;
 	struct utsname myuname;
 
+	/* check the kernel version */
+	if ((uname(&myuname) != 0) || (myuname.release[0] != '2'))
+		return EINVAL;
+
+	k_version = myuname.release[2] - '0';
+	if (k_version > 4)
+		return ENOTSUP;
+
 	/* Parse any options */
 	getopt32(argv, OPTION_STR, &opt_o);
 	arg1 = argv[optind];
 	if (option_mask32 & OPT_o) { // -o /* name the output module */
-		free(m_name);
 		m_name = xstrdup(opt_o);
 	}
 
-	if (arg1 == NULL) {
+	if (arg1 == NULL)
 		bb_show_usage();
-	}
-
-	/* Grab the module name */
-	tmp1 = xstrdup(arg1);
-	tmp = basename(tmp1);
-	len = strlen(tmp);
-
-	if (uname(&myuname) == 0) {
-		if (myuname.release[0] == '2') {
-			k_version = myuname.release[2] - '0';
-		}
-	}
-
-#if ENABLE_FEATURE_2_6_MODULES
-	if (k_version > 4 && len > 3 && tmp[len - 3] == '.'
-	 && tmp[len - 2] == 'k' && tmp[len - 1] == 'o'
-	) {
-		len -= 3;
-		tmp[len] = '\0';
-	} else
-#endif
-		if (len > 2 && tmp[len - 2] == '.' && tmp[len - 1] == 'o') {
-			len -= 2;
-			tmp[len] = '\0';
-		}
 
-
-#if ENABLE_FEATURE_2_6_MODULES
-	if (k_version > 4)
-		m_fullName = xasprintf("%s.ko", tmp);
-	else
-#endif
-		m_fullName = xasprintf("%s.o", tmp);
+	ret = find_module(arg1);
+	if (ret)
+		goto out;
 
 	if (!m_name) {
-		m_name = tmp;
-	} else {
-		free(tmp1);
-		tmp1 = NULL;       /* flag for free(m_name) before exit() */
+		tmp = xstrdup(arg1);
+		m_name = basename(tmp);
 	}
 
-	/* Get a filedesc for the module.  Check that we have a complete path */
-	if (stat(arg1, &st) < 0 || !S_ISREG(st.st_mode)
-	 || (fp = fopen(arg1, "r")) == NULL
-	) {
-		/* Hmm.  Could not open it.  First search under /lib/modules/`uname -r`,
-		 * but do not error out yet if we fail to find it... */
-		if (k_version) {	/* uname succeedd */
-			char *module_dir;
-			char *tmdn;
-
-			tmdn = concat_path_file(_PATH_MODULES, myuname.release);
-			/* Jump through hoops in case /lib/modules/`uname -r`
-			 * is a symlink.  We do not want recursive_action to
-			 * follow symlinks, but we do want to follow the
-			 * /lib/modules/`uname -r` dir, So resolve it ourselves
-			 * if it is a link... */
-			module_dir = xmalloc_readlink(tmdn);
-			if (!module_dir)
-				module_dir = xstrdup(tmdn);
-			recursive_action(module_dir, ACTION_RECURSE,
-					check_module_name_match, NULL, m_fullName, 0);
-			free(module_dir);
-			free(tmdn);
-		}
-
-		/* Check if we have found anything yet */
-		if (!m_filename || ((fp = fopen(m_filename, "r")) == NULL)) {
-			int r;
-			char *module_dir;
-
-			free(m_filename);
-			m_filename = NULL;
-			module_dir = xmalloc_readlink(_PATH_MODULES);
-			if (!module_dir)
-				module_dir = xstrdup(_PATH_MODULES);
-			/* No module found under /lib/modules/`uname -r`, this
-			 * time cast the net a bit wider.  Search /lib/modules/ */
-			r = recursive_action(module_dir, ACTION_RECURSE,
-					check_module_name_match, NULL, m_fullName, 0);
-			if (r)
-				bb_error_msg_and_die("%s: module not found", m_fullName);
-			free(module_dir);
-			if (m_filename == NULL
-			 || ((fp = fopen(m_filename, "r")) == NULL)
-			) {
-				bb_error_msg_and_die("%s: module not found", m_fullName);
-			}
-		}
-	} else
-		m_filename = xstrdup(arg1);
-
-	if (flag_verbose)
-		printf("Using %s\n", m_filename);
-
-#if ENABLE_FEATURE_2_6_MODULES
-	if (k_version > 4) {
-		argv[optind] = m_filename;
-		optind--;
-		return insmod_ng_main(argc - optind, argv + optind);
+	fp = fopen(g_filename, "r");
+	if (!fp) {
+		ret = errno;
+		goto out;
 	}
-#endif
 
 	f = obj_load(fp, LOADBITS);
 
@@ -4062,7 +4048,7 @@
 				"\t%s was compiled for kernel version %s\n"
 				"\twhile this kernel is version %s",
 				flag_force_load ? "warning: " : "",
-				m_filename, m_strversion, uts_info.release);
+				g_filename, m_strversion, uts_info.release);
 			if (!flag_force_load)
 				goto out;
 		}
@@ -4104,7 +4090,7 @@
 	hide_special_symbols(f);
 
 #if ENABLE_FEATURE_INSMOD_KSYMOOPS_SYMBOLS
-	add_ksymoops_symbols(f, m_filename, m_name);
+	add_ksymoops_symbols(f, g_filename, m_name);
 #endif /* FEATURE_INSMOD_KSYMOOPS_SYMBOLS */
 
 	new_create_module_ksymtab(f);
@@ -4147,18 +4133,19 @@
 	if (flag_print_load_map)
 		print_load_map(f);
 
-	exit_status = EXIT_SUCCESS;
+	ret = EXIT_SUCCESS;
 
  out:
 #if ENABLE_FEATURE_CLEAN_UP
 	if (fp)
 		fclose(fp);
-	free(tmp1);
-	if (!tmp1)
+	if (tmp)
+		free(tmp);
+	else if (m_name)
 		free(m_name);
-	free(m_filename);
+	free(g_filename);
 #endif
-	return exit_status;
+	return ret;
 }
 
 #endif /* ENABLE_FEATURE_2_4_MODULES */
@@ -4190,23 +4177,32 @@
 	}
 }
 
-#if !ENABLE_FEATURE_2_4_MODULES
-int insmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int insmod_main(int argc, char **argv)
-#else
-static int insmod_ng_main(int argc, char **argv)
-#endif
+int insmod_main_26(int argc, char **argv)
 {
-	long ret;
-	size_t len;
+	char *filename, *options;
+	struct utsname myuname;
+	int k_version;
 	int optlen;
+	size_t len;
 	void *map;
-	char *filename, *options;
+	long ret = 0;
+
+	/* check the kernel version */
+	if ((uname(&myuname) != 0) || (myuname.release[0] != '2'))
+		return EINVAL;
+
+	k_version = myuname.release[2] - '0';
+	if (k_version <= 4)
+		return ENOTSUP;
 
 	filename = *++argv;
 	if (!filename)
 		bb_show_usage();
 
+	ret = find_module(filename);
+	if (ret || (g_filename == NULL))
+		goto done;
+
 	/* Rest is options */
 	options = xzalloc(1);
 	optlen = 0;
@@ -4216,36 +4212,47 @@
 		optlen += sprintf(options + optlen, (strchr(*argv,' ') ? "\"%s\" " : "%s "), *argv);
 	}
 
-#if 0
-	/* Any special reason why mmap? It isn't performace critical... */
-	int fd;
-	struct stat st;
-	unsigned long len;
-	fd = xopen(filename, O_RDONLY);
-	fstat(fd, &st);
-	len = st.st_size;
-	map = mmap(NULL, len, PROT_READ, MAP_PRIVATE, fd, 0);
-	if (map == MAP_FAILED) {
-		bb_perror_msg_and_die("cannot mmap '%s'", filename);
-	}
-
-	/* map == NULL on Blackfin, probably on other MMU-less systems too. Workaround. */
-	if (map == NULL) {
-		map = xmalloc(len);
-		xread(fd, map, len);
-	}
-#else
 	len = MAXINT(ssize_t);
-	map = xmalloc_open_read_close(filename, &len);
-#endif
-
+	map = xmalloc_open_read_close(g_filename, &len);
 	ret = syscall(__NR_init_module, map, len, options);
 	if (ret != 0) {
 		bb_perror_msg_and_die("cannot insert '%s': %s (%li)",
-				filename, moderror(errno), ret);
+				g_filename, moderror(errno), ret);
 	}
+done:
+	if (g_filename && (g_filename != filename))
+		free(g_filename);
 
-	return 0;
+	return ret;
 }
 
 #endif
+
+int insmod_main(int argc, char **argv)
+{
+	int ret;
+
+	g_filename = NULL;
+#if ENABLE_FEATURE_2_6_MODULES
+	ret = insmod_main_26(argc, argv);
+	if (ret != ENOTSUP)
+		goto done;
+#endif
+
+#if ENABLE_FEATURE_2_4_MODULES
+	ret = insmod_main_24(argc, argv);
+	if (ret != ENOTSUP)
+		goto done;
+#endif
+
+	fprintf(stderr, "Error: Kernel version not supported\n");
+	return 1;
+
+done:
+	if (ret) {
+		errno = ret;
+		bb_perror_msg("Loading module failed");
+		return ret;
+	} else
+		return 0;
+}