Skip to content

Commit 229e6ee

Browse files
Pratyush Brahmawilldeacon
authored andcommitted
iommu/arm-smmu: Defer probe of clients after smmu device bound
Null pointer dereference occurs due to a race between smmu driver probe and client driver probe, when of_dma_configure() for client is called after the iommu_device_register() for smmu driver probe has executed but before the driver_bound() for smmu driver has been called. Following is how the race occurs: T1:Smmu device probe T2: Client device probe really_probe() arm_smmu_device_probe() iommu_device_register() really_probe() platform_dma_configure() of_dma_configure() of_dma_configure_id() of_iommu_configure() iommu_probe_device() iommu_init_device() arm_smmu_probe_device() arm_smmu_get_by_fwnode() driver_find_device_by_fwnode() driver_find_device() next_device() klist_next() /* null ptr assigned to smmu */ /* null ptr dereference while smmu->streamid_mask */ driver_bound() klist_add_tail() When this null smmu pointer is dereferenced later in arm_smmu_probe_device, the device crashes. Fix this by deferring the probe of the client device until the smmu device has bound to the arm smmu driver. Fixes: 021bb84 ("iommu/arm-smmu: Wire up generic configuration support") Cc: stable@vger.kernel.org Co-developed-by: Prakash Gupta <quic_guptap@quicinc.com> Signed-off-by: Prakash Gupta <quic_guptap@quicinc.com> Signed-off-by: Pratyush Brahma <quic_pbrahma@quicinc.com> Link: https://lore.kernel.org/r/20241004090428.2035-1-quic_pbrahma@quicinc.com [will: Add comment] Signed-off-by: Will Deacon <will@kernel.org>
1 parent d64c805 commit 229e6ee

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

drivers/iommu/arm/arm-smmu/arm-smmu.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1437,6 +1437,17 @@ static struct iommu_device *arm_smmu_probe_device(struct device *dev)
14371437
goto out_free;
14381438
} else {
14391439
smmu = arm_smmu_get_by_fwnode(fwspec->iommu_fwnode);
1440+
1441+
/*
1442+
* Defer probe if the relevant SMMU instance hasn't finished
1443+
* probing yet. This is a fragile hack and we'd ideally
1444+
* avoid this race in the core code. Until that's ironed
1445+
* out, however, this is the most pragmatic option on the
1446+
* table.
1447+
*/
1448+
if (!smmu)
1449+
return ERR_PTR(dev_err_probe(dev, -EPROBE_DEFER,
1450+
"smmu dev has not bound yet\n"));
14401451
}
14411452

14421453
ret = -EINVAL;

0 commit comments

Comments
 (0)