intel-iommu: Fix get_domain_for_dev() error path
authorAlex Williamson <alex.williamson@redhat.com>
Fri, 4 Mar 2011 21:52:30 +0000 (14:52 -0700)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Sat, 12 Mar 2011 14:37:53 +0000 (14:37 +0000)
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
drivers/pci/intel-iommu.c

index 292f223..5dc5d3e 100644 (file)
@@ -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;
        }