diff options
| author |   Robin Murphy <robin.murphy@arm.com> | 2016-11-02 17:31:32 +0000 |
|---|---|---|
| committer |   Joerg Roedel <jroedel@suse.de> | 2016-11-08 14:46:41 +0100 |
| commit | 3c117b543528b0d25801bd75444037dd0fcd2b8d (patch) | |
| tree | 301a1ee2e46951464c3ac173f45890ccd7787933 /drivers/iommu | |
| parent | iommu/arm-smmu: Don't inadvertently reject multiple SMMUv3s (diff) | |
| download | linux-dev-3c117b543528b0d25801bd75444037dd0fcd2b8d.tar.xz linux-dev-3c117b543528b0d25801bd75444037dd0fcd2b8d.zip | |
iommu/arm-smmu: Check that iommu_fwspecs are ours
We seem to have forgotten to check that iommu_fwspecs actually belong to
us before we go ahead and dereference their private data. Oops.
Fixes: 021bb8420d44 ("iommu/arm-smmu: Wire up generic configuration support")
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/arm-smmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 3af7f8f62d0a..d388629ab990 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -1400,7 +1400,7 @@ static int arm_smmu_add_device(struct device *dev) fwspec = dev->iommu_fwspec; if (ret) goto out_free; - } else if (fwspec) { + } else if (fwspec && fwspec->ops == &arm_smmu_ops) { smmu = arm_smmu_get_by_node(to_of_node(fwspec->iommu_fwnode)); } else { return -ENODEV; |