2010-07-09 19:14:53

by Christoph Lameter

Subject: [S+Q2 06/19] 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.

CC: David Rientjes <[email protected]>
Signed-off-by: Christoph Lameter <[email protected]>

---
mm/slub.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)

Index: linux-2.6/mm/slub.c
===================================================================
--- linux-2.6.orig/mm/slub.c 2010-07-06 15:12:14.000000000 -0500
+++ linux-2.6/mm/slub.c 2010-07-06 15:13:48.000000000 -0500
@@ -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);

2010-07-14 22:17:03

by David Rientjes

Subject: Re: [S+Q2 06/19] slub: Check kasprintf results in kmem_cache_init()

On Fri, 9 Jul 2010, Christoph Lameter wrote:

> 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.
>
> CC: David Rientjes <[email protected]>
> Signed-off-by: Christoph Lameter <[email protected]>

Acked-by: David Rientjes <[email protected]>