amba: Fix driver_managed_dma check
Subsystems (2)
PATCH 1/1 amba: 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 TOCTOU issue, where dev->driver becomes valid after to_amba_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.
--- drivers/amba/bus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/amba/bus.c +2 -2
@@ -353,7 +353,7 @@ static void amba_shutdown(struct device *dev)static int amba_dma_configure (struct device *dev) { -struct amba_driver *drv =to_amba_driver (dev->driver); +const struct device_driver *drv =READ_ONCE (dev->driver);enum dev_dma_attr attr;int ret =0 ;
@@ -365,7 +365,7 @@ static int amba_dma_configure(struct device *dev) }/* @drv may not be valid when we're called from the IOMMU layer */ -if (!ret && dev->driver && !drv->driver_managed_dma) { +if (!ret && drv && !to_amba_driver (drv)->driver_managed_dma) { ret =iommu_device_use_default_domain (dev);if (ret)arch_teardown_dma_ops (dev);
Signature · 1 line
2.39.2.101.g768bb238c484.dirty
Quoted 10 lines · Robin Murphy
Since it's not currently safe to take
device_lock()in the IOMMU probe path, that can race againstreally_probe()settingdev->driverbefore attempting to bind. The race itself isn't so bad, since we're only concerned with dereferencingdev->driveritself anyway, but sadly my attempt to implement the check with minimal churn leads to a kind of TOCTOU issue, wheredev->driverbecomes valid afterto_amba_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.
Thanks!
Quoted 33 lines
Reported-by Will McVicker <[email protected]>Fixes bcb81ac6ae3c ("iommu: Get DT/ACPI parsing into the proper probe path")Signed-off-by Robin Murphy <[email protected]>--- drivers/amba/bus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/amba/bus.c +2
-2@@ -353,7 +353,7 @@ static void amba_shutdown(struct device *dev)static int amba_dma_configure (struct device *dev) { -struct amba_driver *drv =to_amba_driver (dev->driver); +const struct device_driver *drv =READ_ONCE (dev->driver);enum dev_dma_attr attr;int ret =0 ;@@ -365,7 +365,7 @@ static int amba_dma_configure(struct device *dev) }/* @drv may not be valid when we're called from the IOMMU layer */ -if (!ret && dev->driver && !drv->driver_managed_dma) { +if (!ret && drv && !to_amba_driver (drv)->driver_managed_dma) { ret =iommu_device_use_default_domain (dev);if (ret)arch_teardown_dma_ops (dev);Signature · 1 line
2.39.2.101.g768bb238c484.dirty
Quoted 8 lines · Robin Murphy
Since it's not currently safe to take
device_lock()in the IOMMU probe path, that can race againstreally_probe()settingdev->driverbefore attempting to bind. The race itself isn't so bad, since we're only concerned with dereferencingdev->driveritself anyway, but sadly my attempt to implement the check with minimal churn leads to a kind of TOCTOU issue, wheredev->driverbecomes valid afterto_amba_driver(NULL)is already computed, and thus the check fails to work as intended.
Quoted 6 lines
Will and I both hit this with the platform bus, but the pattern here is the same, so fix it for correctness too.
Reported-by Will McVicker <[email protected]>Fixes bcb81ac6ae3c ("iommu: Get DT/ACPI parsing into the proper probe path")Signed-off-by Robin Murphy <[email protected]>
arch_teardown_dma_ops(dev);
Hello Robin
We faced this issue with amba_dma_configure race internally as well:
Call trace: amba_dma_configure __iommu_probe_device probe_iommu_group bus_for_each_dev iommu_device_register arm_smmu_device_probe platform_probe really_probe __driver_probe_device driver_probe_device __device_attach_driver bus_for_each_drv __device_attach device_initial_probe bus_probe_device deferred_probe_work_func process_scheduled_works worker_thread kthread ret_from_fork
We raised change for this based on already merged changes that fixed the same TOCTOU race for the platform bus in commit 95deee37a123 ("platform: Fix race condition during DMA
configure at IOMMU probe time") and for fsl-mc in commit 152f33ee30ee
("bus: fsl_mc: Fix driver_managed_dma check").
We later found this change you raised which was never merged. Can you please help to revive and take this change forward for merge.
Regards
Ketan