summaryrefslogtreecommitdiffstats
path: root/arch/cris/kernel
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2012-12-11 09:38:33 +1030
committerRusty Russell <rusty@rustcorp.com.au>2012-12-14 13:06:43 +1030
commit82fab442f5322b016f72891c0db2436c6a6c20b7 (patch)
tree1b55bbf22569cf721c4bc13dc8f96652bad50a26 /arch/cris/kernel
parent54523ec71f8ce99accae97c74152f14f261f7e18 (diff)
downloadlinux-stable-82fab442f5322b016f72891c0db2436c6a6c20b7.tar.gz
linux-stable-82fab442f5322b016f72891c0db2436c6a6c20b7.tar.bz2
linux-stable-82fab442f5322b016f72891c0db2436c6a6c20b7.zip
modules: don't hand 0 to vmalloc.
In commit d0a21265dfb5fa8a David Rientjes unified various archs' module_alloc implementation (including x86) and removed the graduitous shortcut for size == 0. Then, in commit de7d2b567d040e3b, Joe Perches added a warning for zero-length vmallocs, which can happen without kallsyms on modules with no init sections (eg. zlib_deflate). Fix this once and for all; the module code has to handle zero length anyway, so get it right at the caller and remove the now-gratuitous checks within the arch-specific module_alloc implementations. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=42608 Reported-by: Conrad Kostecki <ConiKost@gmx.de> Cc: David Rientjes <rientjes@google.com> Cc: Joe Perches <joe@perches.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'arch/cris/kernel')
-rw-r--r--arch/cris/kernel/module.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/cris/kernel/module.c b/arch/cris/kernel/module.c
index 37400f5869e6..51123f985eb5 100644
--- a/arch/cris/kernel/module.c
+++ b/arch/cris/kernel/module.c
@@ -32,8 +32,6 @@
#ifdef CONFIG_ETRAX_KMALLOCED_MODULES
void *module_alloc(unsigned long size)
{
- if (size == 0)
- return NULL;
return kmalloc(size, GFP_KERNEL);
}