diff options
author | Felix Fietkau <nbd@openwrt.org> | 2012-03-05 00:12:44 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2012-03-05 00:12:44 +0000 |
commit | e308da91e77087e943e0d48a83534cbc68bc03de (patch) | |
tree | 02dc661b6f63a6340a9db62402743644ccf36165 /target | |
parent | b8aead7f927014ec15bf3230569bbe295aeb70f0 (diff) | |
download | mtk-20170518-e308da91e77087e943e0d48a83534cbc68bc03de.zip mtk-20170518-e308da91e77087e943e0d48a83534cbc68bc03de.tar.gz mtk-20170518-e308da91e77087e943e0d48a83534cbc68bc03de.tar.bz2 |
kernel: fix vmalloc stack traces triggered by module with an empty init section (mostly happens on x86)
SVN-Revision: 30813
Diffstat (limited to 'target')
-rw-r--r-- | target/linux/generic/patches-3.2/340-module_alloc_size_check.patch | 20 | ||||
-rw-r--r-- | target/linux/generic/patches-3.3/340-module_alloc_size_check.patch | 20 |
2 files changed, 40 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.2/340-module_alloc_size_check.patch b/target/linux/generic/patches-3.2/340-module_alloc_size_check.patch new file mode 100644 index 0000000..6c7e50a --- /dev/null +++ b/target/linux/generic/patches-3.2/340-module_alloc_size_check.patch @@ -0,0 +1,20 @@ +--- a/kernel/module.c ++++ b/kernel/module.c +@@ -2286,12 +2286,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); 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 0000000..9830bc5 --- /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); |