1 files changed, 10 insertions, 0 deletions

diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
index 4bd7579ec9e6..83e643131e10 100644
--- a/arch/arm64/mm/dma-mapping.c
+++ b/arch/arm64/mm/dma-mapping.c
@@ -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);
 }