aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.3
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-03-05 00:12:44 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-03-05 00:12:44 +0000
commit30e736b60b5a3c6f2f8e7667af681763c44d8d7d (patch)
tree3bd0ad890db8cc954a431cfa59674a66d74c6ecb /target/linux/generic/patches-3.3
parentbac0472b04ce4cecc6821b1ccc6609d3b8e63f05 (diff)
downloadupstream-30e736b60b5a3c6f2f8e7667af681763c44d8d7d.tar.gz
upstream-30e736b60b5a3c6f2f8e7667af681763c44d8d7d.tar.bz2
upstream-30e736b60b5a3c6f2f8e7667af681763c44d8d7d.zip
kernel: fix vmalloc stack traces triggered by module with an empty init section (mostly happens on x86)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30813 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.3')
-rw-r--r--target/linux/generic/patches-3.3/340-module_alloc_size_check.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.3/340-module_alloc_size_check.patch b/target/linux/generic/patches-3.3/340-module_alloc_size_check.patch
new file mode 100644
index 0000000000..9830bc507c
--- /dev/null
+++ b/target/linux/generic/patches-3.3/340-module_alloc_size_check.patch
@@ -0,0 +1,20 @@
+--- 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);