diff options
| author | Shameer Kolothum <shameerali.kolothum.thodi@huawei.com> | 2020-11-19 16:58:46 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2020-11-23 14:57:41 +0000 |
| commit | 77c38c8cf52ef715bfc5cab3d14222d4f3e776e2 (patch) | |
| tree | c4b7f479a370af81423ea38c8a0dbe109b7543e1 /drivers/iommu | |
| parent | 72b55c96f3a5ae6e486c20b5dacf5114060ed042 (diff) | |
| download | linux-77c38c8cf52ef715bfc5cab3d14222d4f3e776e2.tar.bz2 | |
iommu: Check return of __iommu_attach_device()
Currently iommu_create_device_direct_mappings() is called
without checking the return of __iommu_attach_device(). This
may result in failures in iommu driver if dev attach returns
error.
Fixes: ce574c27ae27 ("iommu: Move iommu_group_create_direct_mappings() out of iommu_group_add_device()")
Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Link: https://lore.kernel.org/r/20201119165846.34180-1-shameerali.kolothum.thodi@huawei.com
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/iommu.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index b53446bb8c6b..0f4dc25d46c9 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -264,16 +264,18 @@ int iommu_probe_device(struct device *dev) */ iommu_alloc_default_domain(group, dev); - if (group->default_domain) + if (group->default_domain) { ret = __iommu_attach_device(group->default_domain, dev); + if (ret) { + iommu_group_put(group); + goto err_release; + } + } iommu_create_device_direct_mappings(group, dev); iommu_group_put(group); - if (ret) - goto err_release; - if (ops->probe_finalize) ops->probe_finalize(dev); |