Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932072Ab1FPPzU (ORCPT ); Thu, 16 Jun 2011 11:55:20 -0400 Received: from relay2.sgi.com ([192.48.179.30]:57173 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756555Ab1FPPxx (ORCPT ); Thu, 16 Jun 2011 11:53:53 -0400 Message-Id: <20110616155353.456032542@sgi.com> User-Agent: quilt/0.47-1 Date: Thu, 16 Jun 2011 10:10:39 -0500 From: cpw@sgi.com To: linux-kernel@vger.kernel.org Cc: mingo@elte.hu, x86@kernel.org Subject: [patch 7/8 v4] x86, UV: correct failed topology memory leak References: <20110616151032.729980001@gulag1.americas.sgi.com> Content-Disposition: inline; filename=tlb_uv_sanitymemleak Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1288 Lines: 46 Fix a memory leak in init_per_cpu() when the topology check fails. Diffed against 3.0.0-rc3 Signed-off-by: Cliff Wickman --- 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; } /* -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/