From: Tang Chen <tangchen@xxxxxxxxxxxxxx>
Subject: memblock, memhotplug: fix wrong type in memblock_find_in_range_node().
In memblock_find_in_range_node(), we defined ret as int. But it should be
phys_addr_t because it is used to store the return value from
__memblock_find_range_bottom_up().
The bug has not been triggered because when allocating low memory near the
kernel end, the "int ret" won't turn out to be negative. When we started
to allocate memory on other nodes, and the "int ret" could be minus. Then
the kernel will panic.
A simple way to reproduce this: comment out the following code in numa_init(),
memblock_set_bottom_up(false);
and the kernel won't boot.
Reported-by: Xishi Qiu <qiuxishi@xxxxxxxxxx>
Signed-off-by: Tang Chen <tangchen@xxxxxxxxxxxxxx>
Tested-by: Xishi Qiu <qiuxishi@xxxxxxxxxx>
Cc: <stable@xxxxxxxxxxxxxxx> [3.13+]
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memblock.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff -puN mm/memblock.c~memblock-memhotplug-fix-wrong-type-in-memblock_find_in_range_node mm/memblock.c
--- a/mm/memblock.c~memblock-memhotplug-fix-wrong-type-in-memblock_find_in_range_node
+++ a/mm/memblock.c
@@ -192,8 +192,7 @@ phys_addr_t __init_memblock memblock_fin
phys_addr_t align, phys_addr_t start,
phys_addr_t end, int nid)
{
- int ret;
- phys_addr_t kernel_end;
+ phys_addr_t kernel_end, ret;
/* pump up @end */
if (end == MEMBLOCK_ALLOC_ACCESSIBLE)
_
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html