From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751328AbdEBNFY (ORCPT ); Tue, 2 May 2017 09:05:24 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:35444 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751270AbdEBNFU (ORCPT ); Tue, 2 May 2017 09:05:20 -0400 From: Wei Yang To: kirill@shutemov.name, bp@alien8.de, tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, tj@kernel.org, rientjes@google.com Cc: linux-kernel@vger.kernel.org, Wei Yang Subject: [PATCH V2 1/3] x86/numa_emulation: fix potential memory leak Date: Tue, 2 May 2017 21:04:51 +0800 Message-Id: <20170502130453.5933-2-richard.weiyang@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170502130453.5933-1-richard.weiyang@gmail.com> References: <20170502130453.5933-1-richard.weiyang@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org numa_emulation() needs to allocate a space for phys_dist[] temporarily, while current code may miss to release this when dfl_phys_nid == NUMA_NO_NODE. It is observed in code review instead of in a real case. This patch fixes this by re-order the code path. Signed-off-by: Wei Yang Acked-by: David Rientjes --- arch/x86/mm/numa_emulation.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/arch/x86/mm/numa_emulation.c b/arch/x86/mm/numa_emulation.c index a8f90ce3dedf..eb017c816de6 100644 --- a/arch/x86/mm/numa_emulation.c +++ b/arch/x86/mm/numa_emulation.c @@ -353,6 +353,24 @@ void __init numa_emulation(struct numa_meminfo *numa_meminfo, int numa_dist_cnt) goto no_emu; } + /* + * Determine the max emulated nid and the default phys nid to use + * for unmapped nodes. + */ + max_emu_nid = 0; + dfl_phys_nid = NUMA_NO_NODE; + for (i = 0; i < ARRAY_SIZE(emu_nid_to_phys); i++) { + if (emu_nid_to_phys[i] != NUMA_NO_NODE) { + max_emu_nid = i; + if (dfl_phys_nid == NUMA_NO_NODE) + dfl_phys_nid = emu_nid_to_phys[i]; + } + } + if (dfl_phys_nid == NUMA_NO_NODE) { + pr_warn("NUMA: Warning: can't determine default physical node, disabling emulation\n"); + goto no_emu; + } + /* copy the physical distance table */ if (numa_dist_cnt) { u64 phys; @@ -372,24 +390,6 @@ void __init numa_emulation(struct numa_meminfo *numa_meminfo, int numa_dist_cnt) node_distance(i, j); } - /* - * Determine the max emulated nid and the default phys nid to use - * for unmapped nodes. - */ - max_emu_nid = 0; - dfl_phys_nid = NUMA_NO_NODE; - for (i = 0; i < ARRAY_SIZE(emu_nid_to_phys); i++) { - if (emu_nid_to_phys[i] != NUMA_NO_NODE) { - max_emu_nid = i; - if (dfl_phys_nid == NUMA_NO_NODE) - dfl_phys_nid = emu_nid_to_phys[i]; - } - } - if (dfl_phys_nid == NUMA_NO_NODE) { - pr_warning("NUMA: Warning: can't determine default physical node, disabling emulation\n"); - goto no_emu; - } - /* commit */ *numa_meminfo = ei; -- 2.11.0