1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 4920605892a3..656b9499e748 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -1063,6 +1063,9 @@ int iommu_map(struct iommu_domain *domain, unsigned long iova,
                      domain->ops->pgsize_bitmap == 0UL))
                 return -ENODEV;
 
+        if (unlikely(!(domain->type & __IOMMU_DOMAIN_PAGING)))
+                return -EINVAL;
+
         /* find out the minimum page size supported */
         min_pagesz = 1 << __ffs(domain->ops->pgsize_bitmap);
 
@@ -1114,6 +1117,9 @@ size_t iommu_unmap(struct iommu_domain *domain, unsigned long iova, size_t size)
                      domain->ops->pgsize_bitmap == 0UL))
                 return -ENODEV;
 
+        if (unlikely(!(domain->type & __IOMMU_DOMAIN_PAGING)))
+                return -EINVAL;
+
         /* find out the minimum page size supported */
         min_pagesz = 1 << __ffs(domain->ops->pgsize_bitmap);