iommu/arm-smmu: remove potential NULL dereference on mapping path
authorWill Deacon <will.deacon@arm.com>
Fri, 8 Nov 2013 15:08:06 +0000 (15:08 +0000)
committerWill Deacon <will.deacon@arm.com>
Fri, 6 Dec 2013 16:44:25 +0000 (16:44 +0000)
When handling mapping requests, we dereference the SMMU domain before
checking that it is NULL. This patch fixes the issue by removing the check
altogether, since we don't actually use the leaf_smmu when creating
mappings.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
drivers/iommu/arm-smmu.c

index 6dbcaa4433cd399860fb8a991bf2a62116bd4f8d..ef77e3dd6dd29262d52ad1d5ea08f79336fcc279 100644 (file)
@@ -1423,9 +1423,8 @@ static int arm_smmu_map(struct iommu_domain *domain, unsigned long iova,
                        phys_addr_t paddr, size_t size, int flags)
 {
        struct arm_smmu_domain *smmu_domain = domain->priv;
-       struct arm_smmu_device *smmu = smmu_domain->leaf_smmu;
 
-       if (!smmu_domain || !smmu)
+       if (!smmu_domain)
                return -ENODEV;
 
        /* Check for silent address truncation up the SMMU chain. */