diff options
| author | Joerg Roedel <jroedel@suse.de> | 2014-12-09 12:56:45 +0100 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2015-01-05 12:23:38 +0100 |
| commit | 62c22167dd70b730f61c2b88f950e98154a87980 (patch) | |
| tree | fd84d0bd6da01a6771d14f670ea80e362e2ce472 /drivers/iommu/intel-iommu.c | |
| parent | iommu/ipmmu-vmsa: Change IOMMU_EXEC to IOMMU_NOEXEC (diff) | |
| download | linux-62c22167dd70b730f61c2b88f950e98154a87980.tar.xz linux-62c22167dd70b730f61c2b88f950e98154a87980.zip | |
iommu/vt-d: Fix dmar_domain leak in iommu_attach_device
Since commit 1196c2f a domain is only destroyed in the
notifier path if it is hot-unplugged. This caused a
domain leakage in iommu_attach_device when a driver was
unbound from the device and bound to VFIO. In this case the
device is attached to a new domain and unlinked from the old
domain. At this point nothing points to the old domain
anymore and its memory is leaked.
Fix this by explicitly freeing the old domain in
iommu_attach_domain.
Fixes: 1196c2f (iommu/vt-d: Fix dmar_domain leak in iommu_attach_device)
Cc: stable@vger.kernel.org # v3.18
Tested-by: Jerry Hoemann <jerry.hoemann@hp.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu/intel-iommu.c')
| -rw-r--r-- | drivers/iommu/intel-iommu.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index 1232336b960e..761012114fc7 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -4428,6 +4428,10 @@ static int intel_iommu_attach_device(struct iommu_domain *domain, domain_remove_one_dev_info(old_domain, dev); else domain_remove_dev_info(old_domain); + + if (!domain_type_is_vm_or_si(old_domain) && + list_empty(&old_domain->devices)) + domain_exit(old_domain); } } |