[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1329814703-14398-1-git-send-email-geunsik.lim@gmail.com>
Date: Tue, 21 Feb 2012 17:58:23 +0900
From: Geunsik Lim <geunsik.lim@...il.com>
To: Andrew Morton <akpm@...ux-foundation.org>,
"H. Peter Anvin" <hpa@...ux.intel.com>
Cc: Yinghai Lu <yinghai@...nel.org>,
linux-kernel <linux-kernel@...r.kernel.org>,
linux-mm <linux-mm@...ck.org>
Subject: [PATCH, v2] Fix potentially derefencing uninitialized 'r'.
From: Geunsik Lim <geunsik.lim@...sung.com>
v2: reorganize the code with better way to avoid compilation warning
via the comment of Andrew Morton.
v1: struct memblock_region 'r' will not be initialized potentially
because of while() condition in __next_mem_pfn_range()function.
Solve the compilation warning related problem by initializing
r data structure.
Signed-off-by: Geunsik Lim <geunsik.lim@...sung.com>
---
mm/memblock.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/mm/memblock.c b/mm/memblock.c
index 77b5f22..b8c40c5 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -673,14 +673,18 @@ void __init_memblock __next_mem_pfn_range(int *idx, int nid,
struct memblock_type *type = &memblock.memory;
struct memblock_region *r;
- while (++*idx < type->cnt) {
+ do {
r = &type->regions[*idx];
+ if (++*idx < type->cnt) {
if (PFN_UP(r->base) >= PFN_DOWN(r->base + r->size))
continue;
if (nid == MAX_NUMNODES || nid == r->nid)
break;
- }
+ } else
+ break;
+ } while (1);
+
if (*idx >= type->cnt) {
*idx = -1;
return;
--
1.7.8.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists