[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1357530096-28548-1-git-send-email-linfeng@cn.fujitsu.com>
Date: Mon, 7 Jan 2013 11:41:36 +0800
From: Lin Feng <linfeng@...fujitsu.com>
To: akpm@...ux-foundation.org, tj@...nel.org
Cc: mingo@...nel.org, yinghai@...nel.org, liwanp@...ux.vnet.ibm.com,
benh@...nel.crashing.org, tangchen@...fujitsu.com,
linux-mm@...ck.org, linux-kernel@...r.kernel.org,
Lin Feng <linfeng@...fujitsu.com>
Subject: [PATCH v2] mm: memblock: fix wrong memmove size in memblock_merge_regions()
The memmove span covers from (next+1) to the end of the array, and the index
of next is (i+1), so the index of (next+1) is (i+2). So the size of remaining
array elements is (type->cnt - (i + 2)).
Cc: Tejun Heo <tj@...nel.org>
Reviewed-by: Wanpeng Li <liwanp@...ux.vnet.ibm.com>
Signed-off-by: Lin Feng <linfeng@...fujitsu.com>
---
ChangeLog v1->v2:
- Add a comment pointed out by Tejun.
---
mm/memblock.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/mm/memblock.c b/mm/memblock.c
index 6259055..88adc8a 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -314,7 +314,8 @@ static void __init_memblock memblock_merge_regions(struct memblock_type *type)
}
this->size += next->size;
- memmove(next, next + 1, (type->cnt - (i + 1)) * sizeof(*next));
+ /* move forward from next + 1, index of which is i + 2 */
+ memmove(next, next + 1, (type->cnt - (i + 2)) * sizeof(*next));
type->cnt--;
}
}
--
1.7.11.7
--
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