diff options
| author | Alex Williamson <alex.williamson@redhat.com> | 2011-03-04 14:52:30 -0700 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2011-03-12 14:37:53 +0000 |
| commit | 2fe9723df8e45fd247782adea244a5e653c30bf4 (patch) | |
| tree | 53395a1234747e13d57cd99dd1299e8b6e277f6c /drivers/pci | |
| parent | a97590e56d0d58e1dd262353f7cbd84e81d8e600 (diff) | |
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
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 292f2233295..5dc5d3e3508 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; } |