diff options
author | Christoph Lameter <clameter@sgi.com> | 2007-10-16 10:24:46 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 18:42:53 +0200 |
commit | ef8b4520bd9f8294ffce9abd6158085bde5dc902 (patch) | |
tree | c099a16691ac06208f4d3d65b71e7adaf7361fcd /mm/slob.c | |
parent | calculation of pgoff in do_linear_fault() uses mixed units (diff) | |
download | linux-ef8b4520bd9f8294ffce9abd6158085bde5dc902.tar.xz linux-ef8b4520bd9f8294ffce9abd6158085bde5dc902.zip |
Slab allocators: fail if ksize is called with a NULL parameter
A NULL pointer means that the object was not allocated. One cannot
determine the size of an object that has not been allocated. Currently we
return 0 but we really should BUG() on attempts to determine the size of
something nonexistent.
krealloc() interprets NULL to mean a zero sized object. Handle that
separately in krealloc().
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Matt Mackall <mpm@selenic.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/slob.c')
-rw-r--r-- | mm/slob.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/slob.c b/mm/slob.c index a886e83e17ef..de5d5563a46c 100644 --- a/mm/slob.c +++ b/mm/slob.c @@ -484,7 +484,8 @@ size_t ksize(const void *block) { struct slob_page *sp; - if (unlikely(ZERO_OR_NULL_PTR(block))) + BUG_ON(!block); + if (unlikely(block == ZERO_SIZE_PTR)) return 0; sp = (struct slob_page *)virt_to_page(block); |