summaryrefslogtreecommitdiff
path: root/target/linux/patches/3.4.82/module-alloc-size-check.patch
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-02-26 19:12:00 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-02-26 19:12:00 +0100
commit49a2312ba19ddcd7fecc1ac8177cd1ae1346c4cc (patch)
tree1d9dc20e6d2b987158addd0da286f044eb1d1aee /target/linux/patches/3.4.82/module-alloc-size-check.patch
parent1e14d6284640f07c21d837091c7f87323209b317 (diff)
parent9e358d94cc283c8022091e67fe3ca0580301a62a (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/linux/patches/3.4.82/module-alloc-size-check.patch')
-rw-r--r--target/linux/patches/3.4.82/module-alloc-size-check.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/target/linux/patches/3.4.82/module-alloc-size-check.patch b/target/linux/patches/3.4.82/module-alloc-size-check.patch
new file mode 100644
index 000000000..a792ac60a
--- /dev/null
+++ b/target/linux/patches/3.4.82/module-alloc-size-check.patch
@@ -0,0 +1,21 @@
+https://dev.openwrt.org/browser/trunk/target/linux/generic/patches-3.3/340-module_alloc_size_check.patch?rev=30813
+--- a/kernel/module.c
++++ b/kernel/module.c
+@@ -2322,12 +2322,15 @@
+
+ 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);