Merge branch 'master' of git+ssh://openadk.org/git/openadk

1 files changed, 21 insertions, 0 deletions

diff --git a/target/linux/patches/3.5.6/module-alloc-size-check.patch b/target/linux/patches/3.5.6/module-alloc-size-check.patch
new file mode 100644
index 000000000..a792ac60a
--- /dev/null
+++ b/target/linux/patches/3.5.6/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);