diff options
| author | cpw@sgi.com <cpw@sgi.com> | 2011-06-21 07:21:32 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-06-21 14:50:33 +0200 |
| commit | bbd270e6f45a5ca30e1d3b6133c516a9dc9dd6c0 (patch) | |
| tree | 7789cc0b3ac3bd5e34fc2eb493cac2a9d1d26306 /arch/x86/platform | |
| parent | 442d3924926c62741912d8a930220af253922007 (diff) | |
| download | linux-bbd270e6f45a5ca30e1d3b6133c516a9dc9dd6c0.tar.gz linux-bbd270e6f45a5ca30e1d3b6133c516a9dc9dd6c0.tar.bz2 linux-bbd270e6f45a5ca30e1d3b6133c516a9dc9dd6c0.zip | |
x86, UV: Correct failed topology memory leak
Fix a memory leak in init_per_cpu() when the topology check
fails.
The leak should never occur on deployed systems. It would only occur
in an unexpected topology that would make the BAU unuseable as a result.
Signed-off-by: Cliff Wickman <cpw@sgi.com>
Link: http://lkml.kernel.org/r/20110621122242.981533045@sgi.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/platform')
| -rw-r--r-- | arch/x86/platform/uv/tlb_uv.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c index 5265842b8d0b..db8b915f54bc 100644 --- a/arch/x86/platform/uv/tlb_uv.c +++ b/arch/x86/platform/uv/tlb_uv.c @@ -1797,15 +1797,20 @@ static int __init init_per_cpu(int nuvhubs, int base_part_pnode) uvhub_mask = kzalloc((nuvhubs+7)/8, GFP_KERNEL); if (get_cpu_topology(base_part_pnode, uvhub_descs, uvhub_mask)) - return 1; + goto fail; if (summarize_uvhub_sockets(nuvhubs, uvhub_descs, uvhub_mask)) - return 1; + goto fail; kfree(uvhub_descs); kfree(uvhub_mask); init_per_cpu_tunables(); return 0; + +fail: + kfree(uvhub_descs); + kfree(uvhub_mask); + return 1; } /* |