summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Williamson <alex.williamson@redhat.com>2011-03-04 22:52:30 +0100
committerDavid Woodhouse <David.Woodhouse@intel.com>2011-03-12 15:37:53 +0100
commit2fe9723df8e45fd247782adea244a5e653c30bf4 (patch)
tree53395a1234747e13d57cd99dd1299e8b6e277f6c
parentintel-iommu: Unlink domain from iommu (diff)
downloadlinux-2fe9723df8e45fd247782adea244a5e653c30bf4.tar.xz
linux-2fe9723df8e45fd247782adea244a5e653c30bf4.zip
intel-iommu: Fix get_domain_for_dev() error path
If we run out of domain_ids and fail iommu_attach_domain(), we fall into domain_exit() without having setup enough of the domain structure for this to do anything useful. In fact, it typically runs off into the weeds walking the bogus domain->devices list. Just free the domain. Signed-off-by: Alex Williamson <alex.williamson@redhat.com> Acked-by: Donald Dutile <ddutile@redhat.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> Cc: stable@kernel.org
-rw-r--r--drivers/pci/intel-iommu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index 292f2233295e..5dc5d3e3508e 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -1835,7 +1835,7 @@ static struct dmar_domain *get_domain_for_dev(struct pci_dev *pdev, int gaw)
ret = iommu_attach_domain(domain, iommu);
if (ret) {
- domain_exit(domain);
+ free_domain_mem(domain);
goto error;
}