Skip to content

Commit

Permalink
memblock, memhotplug: fix wrong type in memblock_find_in_range_node().
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Tang Chen <[email protected]>
Tested-by: Xishi Qiu <[email protected]>
Cc: <[email protected]>	[3.13+]
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
tang-chen authored and torvalds committed Aug 29, 2014
1 parent 800df62 commit 0cfb8f0
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions mm/memblock.c
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,7 @@ phys_addr_t __init_memblock memblock_find_in_range_node(phys_addr_t size,
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)
Expand Down

0 comments on commit 0cfb8f0

Please sign in to comment.