From: Johan Hovold <johan@kernel.org>
To: Joerg Roedel <joro@8bytes.org>, Will Deacon <will@kernel.org>
Cc: Robin Murphy <robin.murphy@arm.com>, Sven Peter <sven@kernel.org>,
Janne Grunau <j@jannau.net>,
Rob Clark <robin.clark@oss.qualcomm.com>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Yong Wu <yong.wu@mediatek.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora.com>,
Chen-Yu Tsai <wens@csie.org>,
Thierry Reding <thierry.reding@gmail.com>,
Krishna Reddy <vdumpa@nvidia.com>,
iommu@lists.linux.dev, linux-kernel@vger.kernel.org,
Johan Hovold <johan@kernel.org>
Subject: [PATCH v3 12/14] iommu/omap: simplify probe_device() error handling
Date: Mon, 20 Oct 2025 06:53:16 +0200 [thread overview]
Message-ID: <20251020045318.30690-13-johan@kernel.org> (raw)
In-Reply-To: <20251020045318.30690-1-johan@kernel.org>
Simplify the probe_device() error handling by dropping the iommu OF node
reference sooner.
Acked-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
---
drivers/iommu/omap-iommu.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
index c0315c86cd18..7bbc6928c8d0 100644
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
@@ -1668,8 +1668,8 @@ static struct iommu_device *omap_iommu_probe_device(struct device *dev)
}
pdev = of_find_device_by_node(np);
+ of_node_put(np);
if (!pdev) {
- of_node_put(np);
kfree(arch_data);
return ERR_PTR(-ENODEV);
}
@@ -1677,14 +1677,11 @@ static struct iommu_device *omap_iommu_probe_device(struct device *dev)
oiommu = platform_get_drvdata(pdev);
put_device(&pdev->dev);
if (!oiommu) {
- of_node_put(np);
kfree(arch_data);
return ERR_PTR(-EINVAL);
}
tmp->iommu_dev = oiommu;
-
- of_node_put(np);
}
dev_iommu_priv_set(dev, arch_data);
--
2.49.1
next prev parent reply other threads:[~2025-10-20 4:56 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-20 4:53 [PATCH v3 00/14] iommu: fix device leaks Johan Hovold
2025-10-20 4:53 ` [PATCH v3 01/14] iommu/apple-dart: fix device leak on of_xlate() Johan Hovold
2025-10-20 4:53 ` [PATCH v3 02/14] iommu/qcom: " Johan Hovold
2025-10-20 4:53 ` [PATCH v3 03/14] iommu/exynos: " Johan Hovold
2025-10-20 4:53 ` [PATCH v3 04/14] iommu/ipmmu-vmsa: " Johan Hovold
2025-10-20 4:53 ` [PATCH v3 05/14] iommu/mediatek: " Johan Hovold
2025-10-20 10:35 ` AngeloGioacchino Del Regno
2025-10-20 4:53 ` [PATCH v3 06/14] iommu/mediatek: fix use-after-free on probe deferral Johan Hovold
2025-10-20 10:35 ` AngeloGioacchino Del Regno
2025-10-25 9:18 ` Yong Wu (吴勇)
2025-10-20 4:53 ` [PATCH v3 07/14] iommu/mediatek: simplify dt parsing error handling Johan Hovold
2025-10-20 10:35 ` AngeloGioacchino Del Regno
2025-10-25 9:18 ` Yong Wu (吴勇)
2025-10-20 4:53 ` [PATCH v3 08/14] iommu/mediatek-v1: fix device leak on probe_device() Johan Hovold
2025-10-20 10:35 ` AngeloGioacchino Del Regno
2025-10-20 4:53 ` [PATCH v3 09/14] iommu/mediatek-v1: fix device leaks on probe() Johan Hovold
2025-10-20 10:35 ` AngeloGioacchino Del Regno
2025-10-20 4:53 ` [PATCH v3 10/14] iommu/mediatek-v1: add missing larb count sanity check Johan Hovold
2025-10-20 10:35 ` AngeloGioacchino Del Regno
2025-10-20 4:53 ` [PATCH v3 11/14] iommu/omap: fix device leaks on probe_device() Johan Hovold
2025-10-20 4:53 ` Johan Hovold [this message]
2025-10-20 4:53 ` [PATCH v3 13/14] iommu/sun50i: fix device leak on of_xlate() Johan Hovold
2025-10-20 4:53 ` [PATCH v3 14/14] iommu/tegra: fix device leak on probe_device() Johan Hovold
2025-11-10 9:14 ` [PATCH v3 00/14] iommu: fix device leaks Johan Hovold
2025-11-17 9:05 ` Joerg Roedel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251020045318.30690-13-johan@kernel.org \
--to=johan@kernel.org \
--cc=angelogioacchino.delregno@collabora.com \
--cc=iommu@lists.linux.dev \
--cc=j@jannau.net \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=matthias.bgg@gmail.com \
--cc=robin.clark@oss.qualcomm.com \
--cc=robin.murphy@arm.com \
--cc=sven@kernel.org \
--cc=thierry.reding@gmail.com \
--cc=vdumpa@nvidia.com \
--cc=wens@csie.org \
--cc=will@kernel.org \
--cc=yong.wu@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.