diff options
| author | Christoph Lameter <cl@linux-foundation.org> | 2010-07-09 14:07:12 -0500 |
|---|---|---|
| committer | Pekka Enberg <penberg@cs.helsinki.fi> | 2010-07-16 11:13:07 +0300 |
| commit | d7278bd7d1aab5c6d35fd271eeb860548f0bd0bb (patch) | |
| tree | 24f82cf0c312c69291b7f4ed4879a0a345558cac /mm | |
| parent | f90ec390148fdbc0db38c477bc6dc94db721e7f1 (diff) | |
| download | blackbird-op-linux-d7278bd7d1aab5c6d35fd271eeb860548f0bd0bb.tar.gz blackbird-op-linux-d7278bd7d1aab5c6d35fd271eeb860548f0bd0bb.zip | |
slub: Check kasprintf results in kmem_cache_init()
Small allocations may fail during slab bringup which is fatal. Add a BUG_ON()
so that we fail immediately rather than failing later during sysfs
processing.
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Christoph Lameter <cl@linux-foundation.org>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/slub.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mm/slub.c b/mm/slub.c index 2c1190351726..8655be5b7404 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -3118,9 +3118,12 @@ void __init kmem_cache_init(void) slab_state = UP; /* Provide the correct kmalloc names now that the caches are up */ - for (i = KMALLOC_SHIFT_LOW; i < SLUB_PAGE_SHIFT; i++) - kmalloc_caches[i]. name = - kasprintf(GFP_NOWAIT, "kmalloc-%d", 1 << i); + for (i = KMALLOC_SHIFT_LOW; i < SLUB_PAGE_SHIFT; i++) { + char *s = kasprintf(GFP_NOWAIT, "kmalloc-%d", 1 << i); + + BUG_ON(!s); + kmalloc_caches[i].name = s; + } #ifdef CONFIG_SMP register_cpu_notifier(&slab_notifier); |
