From 12d00f6a121877235a5cacc56386936dd9bb81af Mon Sep 17 00:00:00 2001 From: Akinobu Mita Date: Thu, 18 Oct 2007 03:05:11 -0700 Subject: cpu hotplug: slab: fix memory leak in cpu hotplug error path This patch fixes memory leak in error path. In reality, we don't need to call cpuup_canceled(cpu) for now. But upcoming cpu hotplug error handling change needs this. Cc: Christoph Lameter Cc: Gautham R Shenoy Acked-by: Pekka Enberg Signed-off-by: Akinobu Mita Cc: Gautham R Shenoy Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- mm/slab.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mm/slab.c b/mm/slab.c index 671588497e8..54eb555c4ef 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -1282,13 +1282,18 @@ static int __cpuinit cpuup_prepare(long cpu) shared = alloc_arraycache(node, cachep->shared * cachep->batchcount, 0xbaadf00d); - if (!shared) + if (!shared) { + kfree(nc); goto bad; + } } if (use_alien_caches) { alien = alloc_alien_cache(node, cachep->limit); - if (!alien) + if (!alien) { + kfree(shared); + kfree(nc); goto bad; + } } cachep->array[cpu] = nc; l3 = cachep->nodelists[node]; @@ -1315,6 +1320,7 @@ static int __cpuinit cpuup_prepare(long cpu) } return 0; bad: + cpuup_canceled(cpu); return -ENOMEM; } -- cgit v1.2.3