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

SVN-Revision: 30813
This commit is contained in:
Felix Fietkau 2012-03-05 00:12:44 +00:00
parent b8aead7f92
commit e308da91e7
2 changed files with 40 additions and 0 deletions

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

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