Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762246AbcLUXbT (ORCPT ); Wed, 21 Dec 2016 18:31:19 -0500 Received: from mail-pg0-f68.google.com ([74.125.83.68]:33727 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761938AbcLUXbS (ORCPT ); Wed, 21 Dec 2016 18:31:18 -0500 From: Wei Yang To: trivial@kernel.org, akpm@linux-foundation.org, mhocko@kernel.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: Wed, 21 Dec 2016 23:30:33 +0000 Message-Id: <1482363033-24754-3-git-send-email-richard.weiyang@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1482363033-24754-1-git-send-email-richard.weiyang@gmail.com> References: <1482363033-24754-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: 1544 Lines: 52 memblock_reserve() would add a new range to memblock.reserved in case the new range is not totally covered by any of the current memblock.reserved range. If the memblock.reserved is full and can't resize, memblock_reserve() would fail. This doesn't happen in real world now, I observed this during code review. While theoretically, it has the chance to happen. And if it happens, others would think this range of memory is still available and may corrupt the memory. This patch checks the return value and goto "done" after it succeeds. 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 4929e06..d0f2c96 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -1274,18 +1274,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; } @@ -1303,7 +1302,6 @@ static void * __init memblock_virt_alloc_internal( return NULL; done: - memblock_reserve(alloc, size); ptr = phys_to_virt(alloc); memset(ptr, 0, size); -- 2.5.0