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

bus: fsl_mc: 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_fsl_mc_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.

Reported-by: Will McVicker <willmcvicker@google.com>
Fixes: bcb81ac6ae3c ("iommu: Get DT/ACPI parsing into the proper probe path")
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Reviewed-by: Will McVicker <willmcvicker@google.com>
Link: https://lore.kernel.org/r/20250425133929.646493-3-robin.murphy@arm.com
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>

authored by

Robin Murphy and committed by
Christophe Leroy
152f33ee 23d06013

+3 -3
+3 -3
drivers/bus/fsl-mc/fsl-mc-bus.c
··· 139 139 140 140 static int fsl_mc_dma_configure(struct device *dev) 141 141 { 142 + const struct device_driver *drv = READ_ONCE(dev->driver); 142 143 struct device *dma_dev = dev; 143 144 struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev); 144 - struct fsl_mc_driver *mc_drv = to_fsl_mc_driver(dev->driver); 145 145 u32 input_id = mc_dev->icid; 146 146 int ret; 147 147 ··· 153 153 else 154 154 ret = acpi_dma_configure_id(dev, DEV_DMA_COHERENT, &input_id); 155 155 156 - /* @mc_drv may not be valid when we're called from the IOMMU layer */ 157 - if (!ret && dev->driver && !mc_drv->driver_managed_dma) { 156 + /* @drv may not be valid when we're called from the IOMMU layer */ 157 + if (!ret && drv && !to_fsl_mc_driver(drv)->driver_managed_dma) { 158 158 ret = iommu_device_use_default_domain(dev); 159 159 if (ret) 160 160 arch_teardown_dma_ops(dev);