qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-23 22:05:20 +02:00
Code

kernel: fix vmalloc stack traces triggered by module with an empty init section (mostly happens on x86)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30813 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2012-03-05 00:12:44 +00:00
parent 75d6b8d77f
commit 7485bf2113
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
target/linux/generic/patches-3.2/340-module_alloc_size_check.patch Normal file
View File

@ -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);

20
target/linux/generic/patches-3.3/340-module_alloc_size_check.patch Normal file
View File

@ -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);