Skip to content

Commit 78447d4

Browse files
rmurphy-armbjorn-helgaas
authored andcommitted
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: bcb81ac ("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
1 parent 19272b3 commit 78447d4

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

drivers/pci/pci-driver.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1628,7 +1628,7 @@ static int pci_bus_num_vf(struct device *dev)
16281628
*/
16291629
static int pci_dma_configure(struct device *dev)
16301630
{
1631-
struct pci_driver *driver = to_pci_driver(dev->driver);
1631+
const struct device_driver *drv = READ_ONCE(dev->driver);
16321632
struct device *bridge;
16331633
int ret = 0;
16341634

@@ -1645,8 +1645,8 @@ static int pci_dma_configure(struct device *dev)
16451645

16461646
pci_put_host_bridge_device(bridge);
16471647

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) {
16501650
ret = iommu_device_use_default_domain(dev);
16511651
if (ret)
16521652
arch_teardown_dma_ops(dev);

0 commit comments

Comments
 (0)