Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c666e8d5 authored by Laura Abbott's avatar Laura Abbott Committed by Catalin Marinas
Browse files

arm64: Warn on NULL device structure for dma APIs 



Although parts of the DMA apis may properly check for NULL devices,
there may be some places that don't. Rather than fix up all the
possible locations, just require a non-NULL device structure to be
used for allocating/freeing.

Cc: Will Deacon <will.deacon@arm.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarLaura Abbott <lauraa@codeaurora.org>
[catalin.marinas@arm.com: s/WARN/WARN_ONCE/]
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 4bff28cc

arch/arm64/mm/dma-mapping.c

+10 −0
Original line number Diff line number Diff line
@@ -33,6 +33,11 @@ static void *arm64_swiotlb_alloc_coherent(struct device *dev, size_t size, 
					  dma_addr_t *dma_handle, gfp_t flags,

					  struct dma_attrs *attrs)

{

	if (dev == NULL) {

		WARN_ONCE(1, "Use an actual device structure for DMA allocation\n");

		return NULL;

	}



	if (IS_ENABLED(CONFIG_ZONE_DMA32) &&

	    dev->coherent_dma_mask <= DMA_BIT_MASK(32))

		flags |= GFP_DMA32;
@@ -43,6 +48,11 @@ static void arm64_swiotlb_free_coherent(struct device *dev, size_t size, 
					void *vaddr, dma_addr_t dma_handle,

					struct dma_attrs *attrs)

{

	if (dev == NULL) {

		WARN_ONCE(1, "Use an actual device structure for DMA allocation\n");

		return;

	}



	swiotlb_free_coherent(dev, size, vaddr, dma_handle);

}