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

Commit a10315e5 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

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: default avatarThierry Reding <treding@nvidia.com>
Tested-by: default avatarHeiko Stuebner <heiko@sntech.de>
Reviewed-by: default avatarAlex Williamson <alex.williamson@redhat.com>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 8539c7c1

drivers/iommu/iommu.c

+6 −0
Original line number Diff line number Diff line
@@ -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);