From: Robin Murphy <robin.murphy@arm.com>
To: Yong Wu <yong.wu@mediatek.com>
Cc: Joerg Roedel <joro@8bytes.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
Will Deacon <will@kernel.org>,
iommu@lists.linux-foundation.org,
linux-mediatek@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora.com>,
mingyuan.ma@mediatek.com, yf.wang@mediatek.com,
libo.kang@mediatek.com, chengci.xu@mediatek.com,
youlin.pei@mediatek.com, anan.sun@mediatek.com,
xueqi.zhang@mediatek.com, Guenter Roeck <groeck@chromium.org>,
Dan Carpenter <dan.carpenter@oracle.com>
Subject: Re: [PATCH v2 2/5] iommu/mediatek: Add error path for loop of mm_dts_parse
Date: Thu, 16 Jun 2022 11:31:32 +0100 [thread overview]
Message-ID: <521ed82e-f213-f635-6f5e-3e35ff8cc020@arm.com> (raw)
In-Reply-To: <b2ea919315d0084adb465378e6970dbfa4f0829e.camel@mediatek.com>
On 2022-06-16 11:08, Yong Wu wrote:
> On Thu, 2022-06-16 at 09:59 +0100, Robin Murphy wrote:
>> On 2022-06-16 06:42, Yong Wu wrote:
>>> The mtk_iommu_mm_dts_parse will parse the smi larbs nodes. if the
>>> i+1
>>> larb is parsed fail(return -EINVAL), we should of_node_put for the
>>> 0..i
>>> larbs. In the fail path, one of_node_put matches with
>>> of_parse_phandle in
>>> it.
>>>
>>> Fixes: d2e9a1102cfc ("iommu/mediatek: Contain MM IOMMU flow with
>>> the MM TYPE")
>>> Signed-off-by: Yong Wu <yong.wu@mediatek.com>
>>> ---
>>> drivers/iommu/mtk_iommu.c | 21 ++++++++++++++++-----
>>> 1 file changed, 16 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
>>> index 3b2489e8a6dd..ab24078938bf 100644
>>> --- a/drivers/iommu/mtk_iommu.c
>>> +++ b/drivers/iommu/mtk_iommu.c
>>> @@ -1071,12 +1071,12 @@ static int mtk_iommu_mm_dts_parse(struct
>>> device *dev, struct component_match **m
>>>
>>> plarbdev = of_find_device_by_node(larbnode);
>>> if (!plarbdev) {
>>> - of_node_put(larbnode);
>>> - return -ENODEV;
>>> + ret = -ENODEV;
>>> + goto err_larbnode_put;
>>> }
>>> if (!plarbdev->dev.driver) {
>>> - of_node_put(larbnode);
>>> - return -EPROBE_DEFER;
>>> + ret = -EPROBE_DEFER;
>>> + goto err_larbnode_put;
>>> }
>>> data->larb_imu[id].dev = &plarbdev->dev;
>>>
>>> @@ -1107,9 +1107,20 @@ static int mtk_iommu_mm_dts_parse(struct
>>> device *dev, struct component_match **m
>>> DL_FLAG_STATELESS | DL_FLAG_PM_RUNTIME);
>>> if (!link) {
>>> dev_err(dev, "Unable to link %s.\n", dev_name(data-
>>>> smicomm_dev));
>>> - return -EINVAL;
>>> + ret = -EINVAL;
>>> + goto err_larbnode_put;
>>> }
>>> return 0;
>>> +
>>> +err_larbnode_put:
>>> + while (i--) {
>>> + larbnode = of_parse_phandle(dev->of_node,
>>> "mediatek,larbs", i);
>>> + if (larbnode && of_device_is_available(larbnode)) {
>>> + of_node_put(larbnode);
>>> + of_node_put(larbnode);
>>> + }
>>
>> This looks a bit awkward - could we not just iterate through
>> data->larb_imu and put dev->of_node for each valid dev?
>
> It should work. Thanks very much.
>
>>
>> Also, of_find_device_by_node() takes a reference on the struct
>> device
>> itself, so strictly we should be doing put_device() on those as well
>> if we're bailing out.
>
> Thanks for this hint. A new reference for me. I will add it.
In fact, thinking about it some more we may as well do the of_node_put()
unconditionally immediately after the of_find_device_by_node() call, so
then it's *only* the device references we'd need to worry about cleaning
up in the failure path.
Robin.
next prev parent reply other threads:[~2022-06-16 10:32 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-16 5:41 [PATCH v2 0/5] iommu/mediatek: Improve safety from dts Yong Wu
2022-06-16 5:41 ` [PATCH v2 1/5] iommu/mediatek: Use dev_err_probe to mute probe_defer err log Yong Wu
2022-06-16 13:28 ` Matthias Brugger
2022-06-16 5:42 ` [PATCH v2 2/5] iommu/mediatek: Add error path for loop of mm_dts_parse Yong Wu
2022-06-16 8:59 ` Robin Murphy
2022-06-16 10:08 ` Yong Wu
2022-06-16 10:31 ` Robin Murphy [this message]
2022-06-23 1:54 ` Yong Wu
2022-06-23 10:08 ` Robin Murphy
2022-06-16 13:49 ` Matthias Brugger
2022-06-23 2:12 ` Yong Wu
2022-06-16 5:42 ` [PATCH v2 3/5] iommu/mediatek: Validate number of phandles associated with "mediatek, larbs" Yong Wu
2022-06-16 5:42 ` [PATCH v2 4/5] iommu/mediatek: Improve safety for mediatek, smi property in larb nodes Yong Wu
2022-06-16 5:42 ` [PATCH v2 5/5] iommu/mediatek: Remove a unused "mapping" which is only for v1 Yong Wu
2022-06-16 12:03 ` AngeloGioacchino Del Regno
2022-06-16 13:56 ` Matthias Brugger
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=521ed82e-f213-f635-6f5e-3e35ff8cc020@arm.com \
--to=robin.murphy@arm.com \
--cc=anan.sun@mediatek.com \
--cc=angelogioacchino.delregno@collabora.com \
--cc=chengci.xu@mediatek.com \
--cc=dan.carpenter@oracle.com \
--cc=groeck@chromium.org \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=libo.kang@mediatek.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=mingyuan.ma@mediatek.com \
--cc=will@kernel.org \
--cc=xueqi.zhang@mediatek.com \
--cc=yf.wang@mediatek.com \
--cc=yong.wu@mediatek.com \
--cc=youlin.pei@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).