summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.7/340-module_alloc_size_check.patch
diff options
context:
space:
mode:
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-11-18 18:52:38 +0000
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-11-18 18:52:38 +0000
commita50e0e707635e05dbf60a59fc0de75c141258c6d (patch)
tree86525769ccc1e76c33de9d10b51d14bdc0e1c8f7 /target/linux/generic/patches-3.7/340-module_alloc_size_check.patch
parent1f8d59a46a16000018430935732e9d319e6fd3f1 (diff)
[generic]: add 3.7-rc6 support (patch 820 still has to be fixed)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34247 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.7/340-module_alloc_size_check.patch')
-rw-r--r--target/linux/generic/patches-3.7/340-module_alloc_size_check.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.7/340-module_alloc_size_check.patch b/target/linux/generic/patches-3.7/340-module_alloc_size_check.patch
new file mode 100644
index 000000000..2459b6183
--- /dev/null
+++ b/target/linux/generic/patches-3.7/340-module_alloc_size_check.patch
@@ -0,0 +1,20 @@
+--- a/kernel/module.c
++++ b/kernel/module.c
+@@ -2378,12 +2378,15 @@ static void dynamic_debug_remove(struct
+
+ void * __weak module_alloc(unsigned long size)
+ {
+- return size == 0 ? NULL : vmalloc_exec(size);
++ return vmalloc_exec(size);
+ }
+
+ static void *module_alloc_update_bounds(unsigned long size)
+ {
+- void *ret = module_alloc(size);
++ void *ret = NULL;
++
++ if (size)
++ ret = module_alloc(size);
+
+ if (ret) {
+ mutex_lock(&module_mutex);