[PATCH] mm/memblock: check memblock_reserve on fail in memblock_virt_alloc_internal

From: Alexander Kuleshov
Date: Sat Aug 15 2015 - 14:27:19 EST


This patch adds a check for memblock_reserve() call in the
memblock_virt_alloc_internal() function, because memblock_reserve()
can return -errno on fail.

Signed-off-by: Alexander Kuleshov <kuleshovmail@xxxxxxxxx>
---
mm/memblock.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mm/memblock.c b/mm/memblock.c
index 87108e7..73427546 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -1298,7 +1298,9 @@ again:

return NULL;
done:
- memblock_reserve(alloc, size);
+ if (memblock_reserve(alloc, size))
+ return NULL;
+
ptr = phys_to_virt(alloc);
memset(ptr, 0, size);

--
2.5.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/