Messages in this thread Patch in this message | | | Date | Thu, 16 Jun 2011 10:10:39 -0500 | From | cpw@sgi ... | Subject | [patch 7/8 v4] x86, UV: correct failed topology memory leak |
| |
Fix a memory leak in init_per_cpu() when the topology check fails.
Diffed against 3.0.0-rc3
Signed-off-by: Cliff Wickman <cpw@sgi.com> ---
The leak should never occur after development. It would only occur in an unexpected topology that would make the BAU unuseable as a result.
arch/x86/platform/uv/tlb_uv.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
Index: linux/arch/x86/platform/uv/tlb_uv.c =================================================================== --- linux.orig/arch/x86/platform/uv/tlb_uv.c +++ linux/arch/x86/platform/uv/tlb_uv.c @@ -1797,15 +1797,20 @@ static int __init init_per_cpu(int nuvhu 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; } /*
| |