diff options
| author | Akinobu Mita <akinobu.mita@gmail.com> | 2007-10-18 03:05:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 14:37:21 -0700 |
| commit | 12d00f6a121877235a5cacc56386936dd9bb81af (patch) | |
| tree | dc8aafc8ae729f299b43cffa73c15406e76f76a7 | |
| parent | fbf1e473bd0ecc080a4c37bb89848b16c59ac18b (diff) | |
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>
| -rw-r--r-- | mm/slab.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mm/slab.c b/mm/slab.c index 671588497e82..54eb555c4ef8 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; } |