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.

From: Mike Habeck <[email protected]>
Signed-off-by: Mike Habeck <[email protected]>
Signed-off-by: Mike Travis <[email protected]>
---
 drivers/pci/intel-iommu.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- linux.orig/drivers/pci/intel-iommu.c
+++ linux/drivers/pci/intel-iommu.c
@@ -3395,8 +3395,8 @@ static void domain_remove_one_dev_info(s
        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);

-- 

_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable

Reply via email to