diff options
| author | Philipp Hachtmann <phacht@linux.vnet.ibm.com> | 2014-01-23 15:53:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-23 16:36:51 -0800 |
| commit | 87379ec8c2b8ae0acd526b87d2240afca92a7505 (patch) | |
| tree | cd211d723a92cb4a8d7375e204d771665b60c11b /mm/nobootmem.c | |
| parent | d6441637709ba302905f1076f2afcb6d4ea3a901 (diff) | |
| download | op-kernel-dev-87379ec8c2b8ae0acd526b87d2240afca92a7505.zip op-kernel-dev-87379ec8c2b8ae0acd526b87d2240afca92a7505.tar.gz | |
mm/nobootmem.c: add return value check in __alloc_memory_core_early()
When memblock_reserve() fails because memblock.reserved.regions cannot
be resized, the caller (e.g. alloc_bootmem()) is not informed of the
failed allocation. Therefore alloc_bootmem() silently returns the same
pointer again and again.
This patch adds a check for the return value of memblock_reserve() in
__alloc_memory_core().
Signed-off-by: Philipp Hachtmann <phacht@linux.vnet.ibm.com>
Reviewed-by: Tejun Heo <tj@kernel.org>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Tang Chen <tangchen@cn.fujitsu.com>
Cc: Toshi Kani <toshi.kani@hp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/nobootmem.c')
| -rw-r--r-- | mm/nobootmem.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mm/nobootmem.c b/mm/nobootmem.c index 19121ce..bb1a70c 100644 --- a/mm/nobootmem.c +++ b/mm/nobootmem.c @@ -45,7 +45,9 @@ static void * __init __alloc_memory_core_early(int nid, u64 size, u64 align, if (!addr) return NULL; - memblock_reserve(addr, size); + if (memblock_reserve(addr, size)) + return NULL; + ptr = phys_to_virt(addr); memset(ptr, 0, size); /* |
