1 files changed, 13 insertions, 6 deletions

diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
index 9f5851064aea..dd6a8e2d53a7 100644
--- a/kernel/dma/swiotlb.c
+++ b/kernel/dma/swiotlb.c
@@ -199,6 +199,7 @@ void __init swiotlb_update_mem_attributes(void)
 int __init swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose)
 {
         unsigned long i, bytes;
+        size_t alloc_size;
 
         bytes = nslabs << IO_TLB_SHIFT;
 
@@ -211,12 +212,18 @@ int __init swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose)
          * to find contiguous free memory regions of size up to IO_TLB_SEGSIZE
          * between io_tlb_start and io_tlb_end.
          */
-        io_tlb_list = memblock_alloc(
-                                PAGE_ALIGN(io_tlb_nslabs * sizeof(int)),
-                                PAGE_SIZE);
-        io_tlb_orig_addr = memblock_alloc(
-                                PAGE_ALIGN(io_tlb_nslabs * sizeof(phys_addr_t)),
-                                PAGE_SIZE);
+        alloc_size = PAGE_ALIGN(io_tlb_nslabs * sizeof(int));
+        io_tlb_list = memblock_alloc(alloc_size, PAGE_SIZE);
+        if (!io_tlb_list)
+                panic("%s: Failed to allocate %lu bytes align=0x%lx\n",
+                      __func__, alloc_size, PAGE_SIZE);
+
+        alloc_size = PAGE_ALIGN(io_tlb_nslabs * sizeof(phys_addr_t));
+        io_tlb_orig_addr = memblock_alloc(alloc_size, PAGE_SIZE);
+        if (!io_tlb_orig_addr)
+                panic("%s: Failed to allocate %lu bytes align=0x%lx\n",
+                      __func__, alloc_size, PAGE_SIZE);
+
         for (i = 0; i < io_tlb_nslabs; i++) {
                 io_tlb_list[i] = IO_TLB_SEGSIZE - OFFSET(i, IO_TLB_SEGSIZE);
                 io_tlb_orig_addr[i] = INVALID_PHYS_ADDR;