Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

PCI: Fix driver_managed_dma check

Since it's not currently safe to take device_lock() in the IOMMU probe
path, that can race against really_probe() setting dev->driver before
attempting to bind. The race itself isn't so bad, since we're only
concerned with dereferencing dev->driver itself anyway, but sadly my
attempt to implement the check with minimal churn leads to a kind of
Time-of-Check to Time-of-Use (TOCTOU) issue, where dev->driver becomes
valid after to_pci_driver(NULL) is already computed, and thus the check
fails to work as intended.

Will and I both hit this with the platform bus, but the pattern here is
the same, so fix it for correctness too.

Fixes: bcb81ac6ae3c ("iommu: Get DT/ACPI parsing into the proper probe path")
Reported-by: Will McVicker <willmcvicker@google.com>
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Will McVicker <willmcvicker@google.com>
Link: https://patch.msgid.link/20250425133929.646493-4-robin.murphy@arm.com

authored by

Robin Murphy and committed by
Bjorn Helgaas
78447d45 19272b37

+3 -3
+3 -3
drivers/pci/pci-driver.c
··· 1628 1628 */ 1629 1629 static int pci_dma_configure(struct device *dev) 1630 1630 { 1631 - struct pci_driver *driver = to_pci_driver(dev->driver); 1631 + const struct device_driver *drv = READ_ONCE(dev->driver); 1632 1632 struct device *bridge; 1633 1633 int ret = 0; 1634 1634 ··· 1645 1645 1646 1646 pci_put_host_bridge_device(bridge); 1647 1647 1648 - /* @driver may not be valid when we're called from the IOMMU layer */ 1649 - if (!ret && dev->driver && !driver->driver_managed_dma) { 1648 + /* @drv may not be valid when we're called from the IOMMU layer */ 1649 + if (!ret && drv && !to_pci_driver(drv)->driver_managed_dma) { 1650 1650 ret = iommu_device_use_default_domain(dev); 1651 1651 if (ret) 1652 1652 arch_teardown_dma_ops(dev);