slab: introduce kmalloc_array()

Introduce a kmalloc_array() wrapper that performs integer overflow
checking without zeroing the memory.

Suggested-by: Andrew Morton <akpm@linux-foundation.org>
Suggested-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
This commit is contained in:
Xi Wang
2012-03-05 15:14:41 -08:00
committed by Pekka Enberg
parent 8028dcea8a
commit a8203725df

View File

@@ -190,7 +190,7 @@ size_t ksize(const void *);
#endif #endif
/** /**
* kcalloc - allocate memory for an array. The memory is set to zero. * kmalloc_array - allocate memory for an array.
* @n: number of elements. * @n: number of elements.
* @size: element size. * @size: element size.
* @flags: the type of memory to allocate. * @flags: the type of memory to allocate.
@@ -240,11 +240,22 @@ size_t ksize(const void *);
* for general use, and so are not documented here. For a full list of * for general use, and so are not documented here. For a full list of
* potential flags, always refer to linux/gfp.h. * potential flags, always refer to linux/gfp.h.
*/ */
static inline void *kcalloc(size_t n, size_t size, gfp_t flags) static inline void *kmalloc_array(size_t n, size_t size, gfp_t flags)
{ {
if (size != 0 && n > ULONG_MAX / size) if (size != 0 && n > ULONG_MAX / size)
return NULL; return NULL;
return __kmalloc(n * size, flags | __GFP_ZERO); return __kmalloc(n * size, flags);
}
/**
* kcalloc - allocate memory for an array. The memory is set to zero.
* @n: number of elements.
* @size: element size.
* @flags: the type of memory to allocate (see kmalloc).
*/
static inline void *kcalloc(size_t n, size_t size, gfp_t flags)
{
return kmalloc_array(n, size, flags | __GFP_ZERO);
} }
#if !defined(CONFIG_NUMA) && !defined(CONFIG_SLOB) #if !defined(CONFIG_NUMA) && !defined(CONFIG_SLOB)