[PATCH v1 4/4] iommu/msm: Clean up probe state on registration failure
From: weimin xiong <hidden>
Date: 2026-07-14 06:10:32
Also in:
linux-arm-msm, linux-iommu, lkml
Subsystem:
arm/qualcomm mailing list, iommu subsystem, qualcomm iommu, the rest · Maintainers:
Joerg Roedel, Will Deacon, Rob Clark, Linus Torvalds
msm_iommu_probe() adds the IOMMU to qcom_iommu_devices before creating the IOMMU sysfs device and registering the IOMMU. If either of those later steps fails, the function returns without undoing the list insertion. The iommu_device_register() failure path also leaves the sysfs device behind. Add shared error labels so the list entry and sysfs device are unwound in the reverse order of setup. Signed-off-by: weimin xiong <redacted> --- drivers/iommu/msm_iommu.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c
index 0ad5ff431..d0d926be7 100644
--- a/drivers/iommu/msm_iommu.c
+++ b/drivers/iommu/msm_iommu.c@@ -784,19 +784,25 @@ static int msm_iommu_probe(struct platform_device *pdev) "msm-smmu.%pa", &ioaddr); if (ret) { pr_err("Could not add msm-smmu at %pa to sysfs\n", &ioaddr); - return ret; + goto err_remove_list; } ret = iommu_device_register(&iommu->iommu, &msm_iommu_ops, &pdev->dev); if (ret) { pr_err("Could not register msm-smmu at %pa\n", &ioaddr); - return ret; + goto err_remove_sysfs; } pr_info("device mapped at %p, irq %d with %d ctx banks\n", iommu->base, iommu->irq, iommu->ncb); return ret; + +err_remove_sysfs: + iommu_device_sysfs_remove(&iommu->iommu); +err_remove_list: + list_del(&iommu->dev_node); + return ret; } static const struct of_device_id msm_iommu_dt_match[] = {
--
2.43.0