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-27 19:42:53 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-02-27 19:42:53 +0100
commitb4607f0f799c33138d27dd68fea5c23db2c19756 (patch)
tree19f9bfcf1344d53675d4715343ae1ff26bc4c64b /target/linux/patches/3.4.82/module-alloc-size-check.patch
parent75d149d0e0c688b9f121f06114abdae3bebff62c (diff)
parentfe967bd0b07b9c17a99cc8b31a756d8438a49117 (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);