nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

slab: Return NULL for oversized allocations

Browse source 
The inline path seems to have changed the SLAB behavior for very large
kmalloc allocations with  commit e3366016 ("slab: Use common
kmalloc_index/kmalloc_size functions"). This patch restores the old
behavior but also adds diagnostics so that we can figure where in the
code these large allocations occur.

Reported-and-tested-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: Christoph Lameter <cl@linux.com>
Link: http://lkml.kernel.org/r/201305040348.CIF81716.OStQOHFJMFLOVF@I-love.SAKURA.ne.jp
[ penberg@kernel.org: use WARN_ON_ONCE ]
Signed-off-by: Pekka Enberg <penberg@kernel.org>
This commit is contained in:
Christoph Lameter 2013-05-03 15:43:18 +00:00 committed by Pekka Enberg
parent 14e50c6a9b
commit 6286ae97d1
2 changed files with 9 additions and 0 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

6
include/linux/slab_def.h
View file

@ -126,6 +126,9 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags)
if (!size) if (!size)
return ZERO_SIZE_PTR; return ZERO_SIZE_PTR;
if (WARN_ON_ONCE(size > KMALLOC_MAX_SIZE))
return NULL;
i = kmalloc_index(size); i = kmalloc_index(size);
#ifdef CONFIG_ZONE_DMA #ifdef CONFIG_ZONE_DMA
@ -172,6 +175,9 @@ static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
if (!size) if (!size)
return ZERO_SIZE_PTR; return ZERO_SIZE_PTR;
if (WARN_ON_ONCE(size > KMALLOC_MAX_SIZE))
return NULL;
i = kmalloc_index(size); i = kmalloc_index(size);
#ifdef CONFIG_ZONE_DMA #ifdef CONFIG_ZONE_DMA

3
mm/slab_common.c
View file

@ -373,6 +373,9 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
{ {
int index; int index;
if (WARN_ON_ONCE(size > KMALLOC_MAX_SIZE))
return NULL;
if (size <= 192) { if (size <= 192) {
if (!size) if (!size)
return ZERO_SIZE_PTR; return ZERO_SIZE_PTR;