aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Habeck <habeck@sgi.com>2011-05-28 13:15:07 -0500
committerDavid Woodhouse <David.Woodhouse@intel.com>2011-06-01 12:47:48 +0100
commit8519dc4401ddf8a5399f979870bbeeadbc111186 (patch)
treea1eb0bc0fa29b955a757a1e1c1c76f569e6be4ee
parent825507d6d059f1cbe2503e0e5a3926225b983aec (diff)
downloadlinux-stericsson-8519dc4401ddf8a5399f979870bbeeadbc111186.tar.gz
intel-iommu: Add domain check in domain_remove_one_dev_info
The comment in domain_remove_one_dev_info() states "No need to compare PCI domain; it has to be the same". But for the si_domain that isn't going to be true, as it consists of all the PCI devices that are identity mapped thus multiple PCI domains can be in si_domain. The code needs to validate the PCI domain too. Signed-off-by: Mike Habeck <habeck@sgi.com> Signed-off-by: Mike Travis <travis@sgi.com> Cc: stable@kernel.org Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-rw-r--r--drivers/pci/intel-iommu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index 7f757ce60c5a..b0c96d390802 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -3537,8 +3537,8 @@ static void domain_remove_one_dev_info(struct dmar_domain *domain,
spin_lock_irqsave(&device_domain_lock, flags);
list_for_each_safe(entry, tmp, &domain->devices) {
info = list_entry(entry, struct device_domain_info, link);
- /* No need to compare PCI domain; it has to be the same */
- if (info->bus == pdev->bus->number &&
+ if (info->segment == pci_domain_nr(pdev->bus) &&
+ info->bus == pdev->bus->number &&
info->devfn == pdev->devfn) {
list_del(&info->link);
list_del(&info->global);