Slab allocators: fail if ksize is called with a NULL parameter

[linux-2.6-omap-h63xx.git] / mm / slob.c

diff --git a/mm/slob.c b/mm/slob.c
index a886e83e17efed89a8e89592915a08d8ad5db36a..de5d5563a46c624c82290f0c6591428d1a4fd1c2 100644 (file)
--- 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);