Merge "iommu: iommu-debug: check valid pfn before performing ATOS ops" (7a21e400) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/iommu/iommu-debug.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -1569,6 +1569,8 @@ static ssize_t iommu_debug_atos_write(struct file *file,
		{
		struct iommu_debug_device *ddev = file->private_data;
		dma_addr_t iova;
		phys_addr_t phys;
		unsigned long pfn;

		if (kstrtox_from_user(ubuf, count, 0, &iova)) {
		pr_err_ratelimited("Invalid format for iova\n");
		@@ -1576,7 +1578,14 @@ static ssize_t iommu_debug_atos_write(struct file *file,
		return -EINVAL;
		}

		phys = iommu_iova_to_phys(ddev->domain, ddev->iova);
		pfn = __phys_to_pfn(phys);
		if (!pfn_valid(pfn)) {
		dev_err(ddev->dev, "Invalid ATOS operation page %pa\n", &phys);
		return -EINVAL;
		}
		ddev->iova = iova;

		pr_err_ratelimited("Saved iova=%pa for future ATOS commands\n", &iova);
		return count;
		}