Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753659AbcLKNB6 (ORCPT ); Sun, 11 Dec 2016 08:01:58 -0500 Received: from mail-pg0-f68.google.com ([74.125.83.68]:35114 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752829AbcLKNB5 (ORCPT ); Sun, 11 Dec 2016 08:01:57 -0500 From: Wei Yang To: trivial@kernel.org, akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Wei Yang Subject: [PATCH 2/2] mm/memblock.c: check return value of memblock_reserve() in memblock_virt_alloc_internal() Date: Sun, 11 Dec 2016 12:59:50 +0000 Message-Id: <1481461190-11780-3-git-send-email-richard.weiyang@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1481461190-11780-1-git-send-email-richard.weiyang@gmail.com> References: <1481461190-11780-1-git-send-email-richard.weiyang@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1069 Lines: 44 memblock_reserve() may fail in case there is not enough regions. This patch checks the return value. Signed-off-by: Wei Yang --- mm/memblock.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mm/memblock.c b/mm/memblock.c index 9d402d05..83ad703 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -1268,18 +1268,17 @@ static void * __init memblock_virt_alloc_internal( if (max_addr > memblock.current_limit) max_addr = memblock.current_limit; - again: alloc = memblock_find_in_range_node(size, align, min_addr, max_addr, nid, flags); - if (alloc) + if (alloc && !memblock_reserve(alloc, size)) goto done; if (nid != NUMA_NO_NODE) { alloc = memblock_find_in_range_node(size, align, min_addr, max_addr, NUMA_NO_NODE, flags); - if (alloc) + if (alloc && !memblock_reserve(alloc, size)) goto done; } @@ -1297,7 +1296,6 @@ again: return NULL; done: - memblock_reserve(alloc, size); ptr = phys_to_virt(alloc); memset(ptr, 0, size); -- 1.7.9.5