Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756013Ab1FOPqX (ORCPT ); Wed, 15 Jun 2011 11:46:23 -0400 Received: from relay3.sgi.com ([192.48.152.1]:54838 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755271Ab1FOPqU (ORCPT ); Wed, 15 Jun 2011 11:46:20 -0400 To: linux-kernel@vger.kernel.org Subject: [PATCH 7/8 v2] x86, UV: correct failed topology memory leak Cc: mingo@elte.hu Message-Id: From: Cliff Wickman Date: Wed, 15 Jun 2011 10:47:27 -0500 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1316 Lines: 47 From: Cliff Wickman Fix a memory leak in init_per_cpu() when the topology checks fail. The leak should never occur in practice. It would only occur in an unexpected topology that would make the BAU unuseable as a result. Diffed against 3.0.0-rc3 Signed-off-by: Cliff Wickman --- 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 @@ -1798,15 +1798,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/