iommu: Only allow iommu_map/unmap for paging domains

Check for the new __IOMMU_DOMAIN_PAGING flag before calling
into the iommu drivers ->map and ->unmap call-backs.

Tested-by: Thierry Reding <treding@nvidia.com>
Tested-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Alex Williamson <alex.williamson@redhat.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 4920605892a39d54b6cb415f7de8ef86fc8bc1ff..656b9499e7481d82d58c964808b6a7b30d809c75 100644 (file)
--- 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);