diff options
| author |   Robin Murphy <robin.murphy@arm.com> | 2017-07-03 14:52:24 +0100 |
|---|---|---|
| committer |   Will Deacon <will.deacon@arm.com> | 2017-07-20 10:30:28 +0100 |
| commit | 76557391433c77d330cede1a531b358d2f90df66 (patch) | |
| tree | 6212242b7429459efba683b66dc8bde8f3f2aa0b /drivers/iommu/io-pgtable-arm-v7s.c | |
| parent | iommu/arm-smmu: Fix the error path in arm_smmu_add_device (diff) | |
| download | linux-dev-76557391433c77d330cede1a531b358d2f90df66.tar.xz linux-dev-76557391433c77d330cede1a531b358d2f90df66.zip | |
iommu/io-pgtable: Sanitise map/unmap addresses
It may be an egregious error to attempt to use addresses outside the
range of the pagetable format, but that still doesn't mean we should
merrily wreak havoc by silently mapping/unmapping whatever truncated
portions of them might happen to correspond to real addresses.
Add some up-front checks to sanitise our inputs so that buggy callers
don't invite potential memory corruption.
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'drivers/iommu/io-pgtable-arm-v7s.c')
| -rw-r--r-- | drivers/iommu/io-pgtable-arm-v7s.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c index af330f513653..d665d0dc16e8 100644 --- a/drivers/iommu/io-pgtable-arm-v7s.c +++ b/drivers/iommu/io-pgtable-arm-v7s.c @@ -479,6 +479,9 @@ static int arm_v7s_map(struct io_pgtable_ops *ops, unsigned long iova, if (!(prot & (IOMMU_READ | IOMMU_WRITE))) return 0; + if (WARN_ON(upper_32_bits(iova) || upper_32_bits(paddr))) + return -ERANGE; + ret = __arm_v7s_map(data, iova, paddr, size, prot, 1, data->pgd); /* * Synchronise all PTE updates for the new mapping before there's @@ -659,6 +662,9 @@ static int arm_v7s_unmap(struct io_pgtable_ops *ops, unsigned long iova, struct arm_v7s_io_pgtable *data = io_pgtable_ops_to_data(ops); size_t unmapped; + if (WARN_ON(upper_32_bits(iova))) + return 0; + unmapped = __arm_v7s_unmap(data, iova, size, 1, data->pgd); if (unmapped) io_pgtable_tlb_sync(&data->iop); |