1 files changed, 29 insertions, 3 deletions

diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c
index 1f628e7ac709..b0038ca3aa92 100644
--- a/kernel/dma/mapping.c
+++ b/kernel/dma/mapping.c
@@ -116,11 +116,16 @@ int dma_common_get_sgtable(struct device *dev, struct sg_table *sgt,
         int ret;
 
         if (!dev_is_dma_coherent(dev)) {
+                unsigned long pfn;
+
                 if (!IS_ENABLED(CONFIG_ARCH_HAS_DMA_COHERENT_TO_PFN))
                         return -ENXIO;
 
-                page = pfn_to_page(arch_dma_coherent_to_pfn(dev, cpu_addr,
-                                dma_addr));
+                /* If the PFN is not valid, we do not have a struct page */
+                pfn = arch_dma_coherent_to_pfn(dev, cpu_addr, dma_addr);
+                if (!pfn_valid(pfn))
+                        return -ENXIO;
+                page = pfn_to_page(pfn);
         } else {
                 page = virt_to_page(cpu_addr);
         }
@@ -145,6 +150,23 @@ int dma_get_sgtable_attrs(struct device *dev, struct sg_table *sgt,
 }
 EXPORT_SYMBOL(dma_get_sgtable_attrs);
 
+#ifdef CONFIG_MMU
+/*
+ * Return the page attributes used for mapping dma_alloc_* memory, either in
+ * kernel space if remapping is needed, or to userspace through dma_mmap_*.
+ */
+pgprot_t dma_pgprot(struct device *dev, pgprot_t prot, unsigned long attrs)
+{
+        if (dev_is_dma_coherent(dev) ||
+            (IS_ENABLED(CONFIG_DMA_NONCOHERENT_CACHE_SYNC) &&
+             (attrs & DMA_ATTR_NON_CONSISTENT)))
+                return prot;
+        if (IS_ENABLED(CONFIG_ARCH_HAS_DMA_MMAP_PGPROT))
+                return arch_dma_mmap_pgprot(dev, prot, attrs);
+        return pgprot_noncached(prot);
+}
+#endif /* CONFIG_MMU */
+
 /*
  * Create userspace mapping for the DMA-coherent memory.
  */
@@ -159,7 +181,7 @@ int dma_common_mmap(struct device *dev, struct vm_area_struct *vma,
         unsigned long pfn;
         int ret = -ENXIO;
 
-        vma->vm_page_prot = arch_dma_mmap_pgprot(dev, vma->vm_page_prot, attrs);
+        vma->vm_page_prot = dma_pgprot(dev, vma->vm_page_prot, attrs);
 
         if (dma_mmap_from_dev_coherent(dev, vma, cpu_addr, size, &ret))
                 return ret;
@@ -170,7 +192,11 @@ int dma_common_mmap(struct device *dev, struct vm_area_struct *vma,
         if (!dev_is_dma_coherent(dev)) {
                 if (!IS_ENABLED(CONFIG_ARCH_HAS_DMA_COHERENT_TO_PFN))
                         return -ENXIO;
+
+                /* If the PFN is not valid, we do not have a struct page */
                 pfn = arch_dma_coherent_to_pfn(dev, cpu_addr, dma_addr);
+                if (!pfn_valid(pfn))
+                        return -ENXIO;
         } else {
                 pfn = page_to_pfn(virt_to_page(cpu_addr));
         }