Commit 12d00f6a authored Oct 18, 2007 by Akinobu Mita Committed by Linus Torvalds Oct 18, 2007

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 <clameter@sgi.com>
Cc: Gautham R Shenoy <ego@in.ibm.com>
Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Gautham R Shenoy <ego@in.ibm.com>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent fbf1e473

mm/slab.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -1282,14 +1282,19 @@ 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];
		BUG_ON(!l3);
		@@ -1315,6 +1320,7 @@ static int __cpuinit cpuup_prepare(long cpu)
		}
		return 0;
		bad:
		cpuup_canceled(cpu);
		return -ENOMEM;
		}