Commit 8519dc44 authored May 28, 2011 by Mike Habeck Committed by David Woodhouse Jun 01, 2011

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>

parent 825507d6

drivers/pci/intel-iommu.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);