summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@engr.sgi.com>2005-09-22 21:44:10 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-22 22:17:36 -0700
commiteafb42707b21beb42bba4eae7b742f837ee9d2e0 (patch)
treea2b4f7042bb622ecbe8aaa003a96a6024d8bbc00
parent0cdc82ee1ae36c1ae4631fc3a782faeb0b90df38 (diff)
downloadop-kernel-dev-eafb42707b21beb42bba4eae7b742f837ee9d2e0.zip
op-kernel-dev-eafb42707b21beb42bba4eae7b742f837ee9d2e0.tar.gz
[PATCH] __kmalloc: Generate BUG if size requested is too large.
I had an issue on ia64 where I got a bug in kernel/workqueue because kzalloc returned a NULL pointer due to the task structure getting too big for the slab allocator. Usually these cases are caught by the kmalloc macro in include/linux/slab.h. Compilation will fail if a too big value is passed to kmalloc. However, kzalloc uses __kmalloc which has no check for that. This patch makes __kmalloc bug if a too large entity is requested. Signed-off-by: Christoph Lameter <clameter@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--mm/slab.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/slab.c b/mm/slab.c
index c9adfce..ad113c4 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -2907,8 +2907,7 @@ void *__kmalloc(size_t size, unsigned int __nocast flags)
* functions.
*/
cachep = __find_general_cachep(size, flags);
- if (unlikely(cachep == NULL))
- return NULL;
+ BUG_ON(!cachep); /* Allocation size too large for kmalloc */
return __cache_alloc(cachep, flags);
}
EXPORT_SYMBOL(__kmalloc);
OpenPOWER on IntegriCloud