commit: 2fe9723df8e45fd247782adea244a5e653c30bf4 From: Alex Williamson <[email protected]> Date: Fri, 4 Mar 2011 14:52:30 -0700 Subject: [PATCH] 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 <[email protected]> Acked-by: Donald Dutile <[email protected]> Signed-off-by: David Woodhouse <[email protected]> Cc: [email protected] --- drivers/pci/intel-iommu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c index 292f223..5dc5d3e 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; } _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
