summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2013-11-08 15:08:06 +0000
committerWill Deacon <will.deacon@arm.com>2013-12-06 16:44:25 +0000
commit5552ecdbf9fb4f7608c1d7933a8baafcfa1bb337 (patch)
treef3d3a2c1858cc366ca123a3a7aaf49c4ac8778ad
parenta44a9791e778d9ccda50d5534028ed4057a9a45b (diff)
downloadop-kernel-dev-5552ecdbf9fb4f7608c1d7933a8baafcfa1bb337.zip
op-kernel-dev-5552ecdbf9fb4f7608c1d7933a8baafcfa1bb337.tar.gz
iommu/arm-smmu: remove potential NULL dereference on mapping path
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>
-rw-r--r--drivers/iommu/arm-smmu.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 6dbcaa4..ef77e3d 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -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. */
OpenPOWER on IntegriCloud