diff options
| author | Alex Williamson <alex.williamson@redhat.com> | 2011-03-05 00:52:30 +0300 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-03-14 18:57:22 +0400 |
| commit | 2157c194f878d50eefa763e2045d39c1af5ff45b (patch) | |
| tree | 4a4615ca8475c56ec661b161a61b3b0f5984ff13 /drivers/pci | |
| parent | 1a49c78530feb41662bbe88851808dd5414ee147 (diff) | |
| download | linux-2157c194f878d50eefa763e2045d39c1af5ff45b.tar.xz | |
intel-iommu: Fix get_domain_for_dev() error path
commit 2fe9723df8e45fd247782adea244a5e653c30bf4 upstream.
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>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | 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 62e92e5b0318..2b985b91e242 100644 --- a/drivers/pci/intel-iommu.c +++ b/drivers/pci/intel-iommu.c @@ -1848,7 +1848,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; } |