summaryrefslogtreecommitdiff
path: root/target/linux/patches/3.4.99/module-alloc-size-check.patch
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-07-22 19:41:50 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-07-22 19:42:41 +0200
commit83269248e437d15f040975e5d40dfc9ad599ab0e (patch)
tree5355dfda20e364df32ee2a1122b04ab950100fa5 /target/linux/patches/3.4.99/module-alloc-size-check.patch
parentf964a806c5784f4a0144deffcfbd3c4e6e4da244 (diff)
bump kernel versions, readd sm7xx driver for 3.15.x
Diffstat (limited to 'target/linux/patches/3.4.99/module-alloc-size-check.patch')
-rw-r--r--target/linux/patches/3.4.99/module-alloc-size-check.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/target/linux/patches/3.4.99/module-alloc-size-check.patch b/target/linux/patches/3.4.99/module-alloc-size-check.patch
new file mode 100644
index 000000000..a792ac60a
--- /dev/null
+++ b/target/linux/patches/3.4.99/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);