]> www.infradead.org Git - users/hch/misc.git/commitdiff
iommu/vt-d: Fix incorrect pci_for_each_dma_alias() for non-PCI devices
authorLu Baolu <baolu.lu@linux.intel.com>
Mon, 14 Oct 2024 01:37:44 +0000 (09:37 +0800)
committerJoerg Roedel <jroedel@suse.de>
Tue, 15 Oct 2024 08:17:54 +0000 (10:17 +0200)
Previously, the domain_context_clear() function incorrectly called
pci_for_each_dma_alias() to set up context entries for non-PCI devices.
This could lead to kernel hangs or other unexpected behavior.

Add a check to only call pci_for_each_dma_alias() for PCI devices. For
non-PCI devices, domain_context_clear_one() is called directly.

Reported-by: Todd Brandt <todd.e.brandt@intel.com>
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219363
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219349
Fixes: 9a16ab9d6402 ("iommu/vt-d: Make context clearing consistent with context mapping")
Cc: stable@vger.kernel.org
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Link: https://lore.kernel.org/r/20241014013744.102197-2-baolu.lu@linux.intel.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
drivers/iommu/intel/iommu.c

index 9f6b0780f2ef5e7347d702b5337d99edbcc92292..e860bc9439a28358b04d11682c6a877af3b71d85 100644 (file)
@@ -3340,8 +3340,10 @@ static int domain_context_clear_one_cb(struct pci_dev *pdev, u16 alias, void *op
  */
 static void domain_context_clear(struct device_domain_info *info)
 {
-       if (!dev_is_pci(info->dev))
+       if (!dev_is_pci(info->dev)) {
                domain_context_clear_one(info, info->bus, info->devfn);
+               return;
+       }
 
        pci_for_each_dma_alias(to_pci_dev(info->dev),
                               &domain_context_clear_one_cb, info);