summaryrefslogtreecommitdiffstats
path: root/package/busybox/patches
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-06-15 21:17:52 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-06-15 21:17:52 +0000
commit885f06942ed191ec3ff2b8c30042aa36d8746393 (patch)
treefbb00098ff31d5828e496b4ab99f73a3fbc44ff1 /package/busybox/patches
parente6f792889d79bcba6ebb44859d3f90806b1e8cf1 (diff)
busybox: Fix insmod for linux 3.0
Insmod silently rejected being run on any non 2.x kernel. Make its version check allow newer kernels (and reject 2.4- when not enabling the 2.4 feature). Signed-off-by: Jonas Gorski <jonas.gorski+openwrt@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27189 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/busybox/patches')
-rw-r--r--package/busybox/patches/470-insmod_search.patch25
1 files changed, 16 insertions, 9 deletions
diff --git a/package/busybox/patches/470-insmod_search.patch b/package/busybox/patches/470-insmod_search.patch
index 8c5741d17..b5314e3f0 100644
--- a/package/busybox/patches/470-insmod_search.patch
+++ b/package/busybox/patches/470-insmod_search.patch
@@ -1,6 +1,6 @@
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
-@@ -11,6 +11,99 @@
+@@ -11,6 +11,106 @@
#include "libbb.h"
#include "modutils.h"
@@ -37,20 +37,27 @@
+ char *module_dir, real_module_dir[FILENAME_MAX];
+ int len, slen, ret = ENOENT, k_version;
+ struct utsname myuname;
-+ const char *suffix;
++ const char *suffix = ".ko";
+ struct stat st;
+
+ /* check the kernel version */
-+ if ((uname(&myuname) != 0) || (myuname.release[0] != '2'))
++ if (uname(&myuname) != 0)
+ return EINVAL;
+
-+ k_version = myuname.release[2] - '0';
++ k_version = myuname.release[0] - '0';
++
++ if (k_version < 2 || k_version > 9)
++ return EINVAL;
++
++ if (k_version == 2) {
++ int k_patchlevel = myuname.release[2] - '0';
++ if (k_patchlevel <= 4)
+#if ENABLE_FEATURE_2_4_MODULES
-+ if (k_version <= 4)
-+ suffix = ".o";
-+ else
++ suffix = ".o";
++#else
++ return EINVAL;
+#endif
-+ suffix = ".ko";
++ }
+
+ len = strlen(filename);
+ slen = strlen(suffix);
@@ -100,7 +107,7 @@
/* 2.6 style insmod has no options and required filename
* (not module name - .ko can't be omitted) */
-@@ -59,9 +152,15 @@ int insmod_main(int argc UNUSED_PARAM, c
+@@ -59,9 +159,15 @@ int insmod_main(int argc UNUSED_PARAM, c
if (!filename)
bb_show_usage();