Skip to content

Commit d9b3ce9

Browse files
Pratyush Brahmamehmetb0
authored andcommitted
iommu/arm-smmu: Defer probe of clients after smmu device bound
BugLink: https://bugs.launchpad.net/bugs/2095283 commit 229e6ee upstream. 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> [rm: backport for context conflict prior to 6.8] Signed-off-by: Robin Murphy <robin.murphy@arm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> CVE-2024-56568 Signed-off-by: Koichiro Den <koichiro.den@canonical.com>
1 parent 2b62d28 commit d9b3ce9

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
@@ -1375,6 +1375,17 @@ static struct iommu_device *arm_smmu_probe_device(struct device *dev)
13751375
goto out_free;
13761376
} else if (fwspec && fwspec->ops == &arm_smmu_ops) {
13771377
smmu = arm_smmu_get_by_fwnode(fwspec->iommu_fwnode);
1378+
1379+
/*
1380+
* Defer probe if the relevant SMMU instance hasn't finished
1381+
* probing yet. This is a fragile hack and we'd ideally
1382+
* avoid this race in the core code. Until that's ironed
1383+
* out, however, this is the most pragmatic option on the
1384+
* table.
1385+
*/
1386+
if (!smmu)
1387+
return ERR_PTR(dev_err_probe(dev, -EPROBE_DEFER,
1388+
"smmu dev has not bound yet\n"));
13781389
} else {
13791390
return ERR_PTR(-ENODEV);
13801391
}

0 commit comments

Comments
 (0)