Commit 8a7f97b9 authored by Mike Rapoport's avatar Mike Rapoport Committed by Linus Torvalds
Browse files

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

Add check for the return value of memblock_alloc*() functions and call
panic() in case of error.  The panic message repeats the one used by
panicing memblock allocators with adjustment of parameters to include
only relevant ones.

The replacement was mostly automated with semantic patches like the one
below with manual massaging of format strings.

  @@
  expression ptr, size, align;
  @@
  ptr = memblock_alloc(size, align);
  + if (!ptr)
  + 	panic("%s: Failed to allocate %lu bytes align=0x%lx\n", __func__, size, align);

[anders.roxell@linaro.org: use '%pa' with 'phys_addr_t' type]
  Link: http://lkml.kernel.org/r/20190131161046.21886-1-anders.roxell@linaro.org
[rppt@linux.ibm.com: fix format strings for panics after memblock_alloc]
  Link: http://lkml.kernel.org/r/1548950940-15145-1-git-send-email-rppt@linux.ibm.com
[rppt@linux.ibm.com: don't panic if the allocation in sparse_buffer_init fails]
  Link: http://lkml.kernel.org/r/20190131074018.GD28876@rapoport-lnx
[akpm@linux-foundation.org: fix xtensa printk warning]
Link: http://lkml.kernel.org/r/1548057848-15136-20-git-send-email-rppt@linux.ibm.com


Signed-off-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Signed-off-by: default avatarAnders Roxell <anders.roxell@linaro.org>
Reviewed-by: Guo Ren <ren_guo@c-sky.com>		[c-sky]
Acked-by: Paul Burton <paul.burton@mips.com>		[MIPS]
Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>	[s390]
Reviewed-by: Juergen Gross <jgross@suse.com>		[Xen]
Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>	[m68k]
Acked-by: Max Filippov <jcmvbkbc@gmail.com>		[xtensa]
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: 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: Mark Salter <msalter@redhat.com>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Simek <monstr@monstr.eu>
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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a0bf842e

arch/alpha/kernel/core_cia.c

+3 −0
Original line number Diff line number Diff line
@@ -332,6 +332,9 @@ cia_prepare_tbia_workaround(int window) 


	/* Use minimal 1K map. */

	ppte = memblock_alloc(CIA_BROKEN_TBIA_SIZE, 32768);

	if (!ppte)

		panic("%s: Failed to allocate %u bytes align=0x%x\n",

		      __func__, CIA_BROKEN_TBIA_SIZE, 32768);

	pte = (virt_to_phys(ppte) >> (PAGE_SHIFT - 1)) | 1;



	for (i = 0; i < CIA_BROKEN_TBIA_SIZE / sizeof(unsigned long); ++i)

arch/alpha/kernel/core_marvel.c

+6 −0
Original line number Diff line number Diff line
@@ -83,6 +83,9 @@ mk_resource_name(int pe, int port, char *str) 
	

	sprintf(tmp, "PCI %s PE %d PORT %d", str, pe, port);

	name = memblock_alloc(strlen(tmp) + 1, SMP_CACHE_BYTES);

	if (!name)

		panic("%s: Failed to allocate %zu bytes\n", __func__,

		      strlen(tmp) + 1);

	strcpy(name, tmp);



	return name;
@@ -118,6 +121,9 @@ alloc_io7(unsigned int pe) 
	}



	io7 = memblock_alloc(sizeof(*io7), SMP_CACHE_BYTES);

	if (!io7)

		panic("%s: Failed to allocate %zu bytes\n", __func__,

		      sizeof(*io7));

	io7->pe = pe;

	raw_spin_lock_init(&io7->irq_lock);

arch/alpha/kernel/pci-noop.c

+11 −2
Original line number Diff line number Diff line
@@ -34,6 +34,9 @@ alloc_pci_controller(void) 
	struct pci_controller *hose;



	hose = memblock_alloc(sizeof(*hose), SMP_CACHE_BYTES);

	if (!hose)

		panic("%s: Failed to allocate %zu bytes\n", __func__,

		      sizeof(*hose));



	*hose_tail = hose;

	hose_tail = &hose->next;
@@ -44,7 +47,13 @@ alloc_pci_controller(void) 
struct resource * __init

alloc_resource(void)

{

	return memblock_alloc(sizeof(struct resource), SMP_CACHE_BYTES);

	void *ptr = memblock_alloc(sizeof(struct resource), SMP_CACHE_BYTES);



	if (!ptr)

		panic("%s: Failed to allocate %zu bytes\n", __func__,

		      sizeof(struct resource));



	return ptr;

}



SYSCALL_DEFINE3(pciconfig_iobase, long, which, unsigned long, bus,

arch/alpha/kernel/pci.c

+10 −1
Original line number Diff line number Diff line
@@ -393,6 +393,9 @@ alloc_pci_controller(void) 
	struct pci_controller *hose;



	hose = memblock_alloc(sizeof(*hose), SMP_CACHE_BYTES);

	if (!hose)

		panic("%s: Failed to allocate %zu bytes\n", __func__,

		      sizeof(*hose));



	*hose_tail = hose;

	hose_tail = &hose->next;
@@ -403,7 +406,13 @@ alloc_pci_controller(void) 
struct resource * __init

alloc_resource(void)

{

	return memblock_alloc(sizeof(struct resource), SMP_CACHE_BYTES);

	void *ptr = memblock_alloc(sizeof(struct resource), SMP_CACHE_BYTES);



	if (!ptr)

		panic("%s: Failed to allocate %zu bytes\n", __func__,

		      sizeof(struct resource));



	return ptr;

}

arch/alpha/kernel/pci_iommu.c

+12 −0
Original line number Diff line number Diff line
@@ -80,6 +80,9 @@ iommu_arena_new_node(int nid, struct pci_controller *hose, dma_addr_t base, 
		       "    falling back to system-wide allocation\n",

		       __func__, nid);

		arena = memblock_alloc(sizeof(*arena), SMP_CACHE_BYTES);

		if (!arena)

			panic("%s: Failed to allocate %zu bytes\n", __func__,

			      sizeof(*arena));

	}



	arena->ptes = memblock_alloc_node(sizeof(*arena), align, nid);
@@ -88,12 +91,21 @@ iommu_arena_new_node(int nid, struct pci_controller *hose, dma_addr_t base, 
		       "    falling back to system-wide allocation\n",

		       __func__, nid);

		arena->ptes = memblock_alloc(mem_size, align);

		if (!arena->ptes)

			panic("%s: Failed to allocate %lu bytes align=0x%lx\n",

			      __func__, mem_size, align);

	}



#else /* CONFIG_DISCONTIGMEM */



	arena = memblock_alloc(sizeof(*arena), SMP_CACHE_BYTES);

	if (!arena)

		panic("%s: Failed to allocate %zu bytes\n", __func__,

		      sizeof(*arena));

	arena->ptes = memblock_alloc(mem_size, align);

	if (!arena->ptes)

		panic("%s: Failed to allocate %lu bytes align=0x%lx\n",

		      __func__, mem_size, align);



#endif /* CONFIG_DISCONTIGMEM */

CRA Git | Maintained and supported by SUSTech CRA and CCSE