Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

swiotlb: add checks for the return value of memblock_alloc*()

Add panic() calls if memblock_alloc() returns NULL.

The panic() format duplicates the one used by memblock itself and in
order to avoid explosion with long parameters list replace open coded
allocation size calculations with a local variable.

Link: http://lkml.kernel.org/r/1548057848-15136-19-git-send-email-rppt@linux.ibm.com
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christophe Leroy <christophe.leroy@c-s.fr>
Cc: Christoph Hellwig <hch@lst.de>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Dennis Zhou <dennis@kernel.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Greentime Hu <green.hu@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Guan Xuetao <gxt@pku.edu.cn>
Cc: Guo Ren <guoren@kernel.org>
Cc: Guo Ren <ren_guo@c-sky.com> [c-sky]
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Juergen Gross <jgross@suse.com> [Xen]
Cc: Mark Salter <msalter@redhat.com>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Paul Burton <paul.burton@mips.com>
Cc: Petr Mladek <pmladek@suse.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Rich Felker <dalias@libc.org>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Rob Herring <robh@kernel.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Stafford Horne <shorne@gmail.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Mike Rapoport and committed by
Linus Torvalds
a0bf842e f5c7310a

+13 -6
+13 -6
kernel/dma/swiotlb.c
··· 199 199 int __init swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose) 200 200 { 201 201 unsigned long i, bytes; 202 + size_t alloc_size; 202 203 203 204 bytes = nslabs << IO_TLB_SHIFT; 204 205 ··· 212 211 * to find contiguous free memory regions of size up to IO_TLB_SEGSIZE 213 212 * between io_tlb_start and io_tlb_end. 214 213 */ 215 - io_tlb_list = memblock_alloc( 216 - PAGE_ALIGN(io_tlb_nslabs * sizeof(int)), 217 - PAGE_SIZE); 218 - io_tlb_orig_addr = memblock_alloc( 219 - PAGE_ALIGN(io_tlb_nslabs * sizeof(phys_addr_t)), 220 - PAGE_SIZE); 214 + alloc_size = PAGE_ALIGN(io_tlb_nslabs * sizeof(int)); 215 + io_tlb_list = memblock_alloc(alloc_size, PAGE_SIZE); 216 + if (!io_tlb_list) 217 + panic("%s: Failed to allocate %lu bytes align=0x%lx\n", 218 + __func__, alloc_size, PAGE_SIZE); 219 + 220 + alloc_size = PAGE_ALIGN(io_tlb_nslabs * sizeof(phys_addr_t)); 221 + io_tlb_orig_addr = memblock_alloc(alloc_size, PAGE_SIZE); 222 + if (!io_tlb_orig_addr) 223 + panic("%s: Failed to allocate %lu bytes align=0x%lx\n", 224 + __func__, alloc_size, PAGE_SIZE); 225 + 221 226 for (i = 0; i < io_tlb_nslabs; i++) { 222 227 io_tlb_list[i] = IO_TLB_SEGSIZE - OFFSET(i, IO_TLB_SEGSIZE); 223 228 io_tlb_orig_addr[i] = INVALID_PHYS_ADDR;