Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8203725 authored by Xi Wang's avatar Xi Wang Committed by Pekka Enberg
Browse files

slab: introduce kmalloc_array() 



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

Suggested-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Suggested-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarXi Wang <xi.wang@gmail.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarPekka Enberg <penberg@kernel.org>
parent 8028dcea

include/linux/slab.h

+14 −3
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ size_t ksize(const void *); 
#endif



/**

 * kcalloc - allocate memory for an array. The memory is set to zero.

 * kmalloc_array - allocate memory for an array.

 * @n: number of elements.

 * @size: element size.

 * @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

 * 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)

		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)