Skip to content

Commit 152f33e

Browse files
rmurphy-armchleroy
authored andcommitted
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 <[email protected]> Fixes: bcb81ac ("iommu: Get DT/ACPI parsing into the proper probe path") Signed-off-by: Robin Murphy <[email protected]> Reviewed-by: Will McVicker <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Christophe Leroy <[email protected]>
1 parent 23d0601 commit 152f33e

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/bus/fsl-mc/fsl-mc-bus.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,9 @@ static int fsl_mc_bus_uevent(const struct device *dev, struct kobj_uevent_env *e
139139

140140
static int fsl_mc_dma_configure(struct device *dev)
141141
{
142+
const struct device_driver *drv = READ_ONCE(dev->driver);
142143
struct device *dma_dev = dev;
143144
struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev);
144-
struct fsl_mc_driver *mc_drv = to_fsl_mc_driver(dev->driver);
145145
u32 input_id = mc_dev->icid;
146146
int ret;
147147

@@ -153,8 +153,8 @@ static int fsl_mc_dma_configure(struct device *dev)
153153
else
154154
ret = acpi_dma_configure_id(dev, DEV_DMA_COHERENT, &input_id);
155155

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) {
158158
ret = iommu_device_use_default_domain(dev);
159159
if (ret)
160160
arch_teardown_dma_ops(dev);

0 commit comments

Comments
 (0)