On Wed, Aug 21, 2019 at 09:53:10PM +0800, Yong Wu wrote: > Use ias/oas to check the valid iova/pa. Synchronize this checking with > io-pgtable-arm.c. > > Signed-off-by: Yong Wu <yong.wu@xxxxxxxxxxxx> > --- > drivers/iommu/io-pgtable-arm-v7s.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c > index 72f1880..fa1b38f 100644 > --- a/drivers/iommu/io-pgtable-arm-v7s.c > +++ b/drivers/iommu/io-pgtable-arm-v7s.c > @@ -504,7 +504,8 @@ 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))) > + if (WARN_ON(iova >= (1ULL << data->iop.cfg.ias) || > + paddr >= (1ULL << data->iop.cfg.oas))) > return -ERANGE; Acked-by: Will Deacon <will@xxxxxxxxxx> Will
