diff options
| author |   Will Deacon <will.deacon@arm.com> | 2014-07-04 11:06:01 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2014-07-04 13:16:05 +0100 |
| commit | d3bca16635ae7443139c4408def7c1a50755083f (patch) | |
| tree | e88a4f7b1fca963cd350631aeb447694cc7b49fb /drivers/iommu/arm-smmu.c | |
| parent | iommu/arm-smmu: prefer stage-1 mappings where we have a choice (diff) | |
| download | linux-dev-d3bca16635ae7443139c4408def7c1a50755083f.tar.xz linux-dev-d3bca16635ae7443139c4408def7c1a50755083f.zip | |
iommu/arm-smmu: fix capability checking prior to device attach
If somebody attempts to check the capability of an IOMMU domain prior to
device attach, then we'll try to dereference a NULL SMMU pointer through
the SMMU domain (since we can't determine the actual SMMU instance until
we have a device attached).
This patch fixes the capability check so that non-global features are
reported as being absent when no device is attached to the domain.
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'drivers/iommu/arm-smmu.c')
| -rw-r--r-- | drivers/iommu/arm-smmu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 7638b579e08d..5496de58fc3b 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -1509,7 +1509,8 @@ static int arm_smmu_domain_has_cap(struct iommu_domain *domain, unsigned long cap) { struct arm_smmu_domain *smmu_domain = domain->priv; - u32 features = smmu_domain->smmu->features; + struct arm_smmu_device *smmu = smmu_domain->smmu; + u32 features = smmu ? smmu->features : 0; switch (cap) { case IOMMU_CAP_CACHE_COHERENCY: |