linux-kernel - Re: [PATCH] iommu/mediatek: fix leaked of

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Wed, 17 Apr 2019 10:28:21 +0200
From:   Matthias Brugger <matthias.bgg@...il.com>
To:     Wen Yang <wen.yang99@....com.cn>, linux-kernel@...r.kernel.org
Cc:     wang.yi59@....com.cn, Joerg Roedel <joro@...tes.org>,
        iommu@...ts.linux-foundation.org,
        linux-arm-kernel@...ts.infradead.org,
        linux-mediatek@...ts.infradead.org
Subject: Re: [PATCH] iommu/mediatek: fix leaked of_node references



On 17/04/2019 04:41, Wen Yang wrote:
> The call to of_parse_phandle returns a node pointer with refcount
> incremented thus it must be explicitly decremented after the last
> usage.
> 
> 581 static int mtk_iommu_probe(struct platform_device *pdev)
> 582 {
>     ...
> 626         for (i = 0; i < larb_nr; i++) {
> 627                 struct device_node *larbnode;
>     ...
> 631                 larbnode = of_parse_phandle(...);
> 632                 if (!larbnode)
> 633                         return -EINVAL;
> 634
> 635                 if (!of_device_is_available(larbnode))
> 636                         continue;             ---> leaked here
> 637
>     ...
> 643                 if (!plarbdev)
> 644                         return -EPROBE_DEFER; ---> leaked here
>     ...
> 647                 component_match_add_release(dev, &match, release_of,
> 648                                             compare_of, larbnode);
>                                    ---> release_of will call of_node_put
> 649         }
>     ...
> 650
> 
> Detected by coccinelle with the following warnings:
> ./drivers/iommu/mtk_iommu.c:644:3-9: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 631, but without a corresponding object release within this function.
> 
> Signed-off-by: Wen Yang <wen.yang99@....com.cn>
> Cc: Joerg Roedel <joro@...tes.org>
> Cc: Matthias Brugger <matthias.bgg@...il.com>
> Cc: iommu@...ts.linux-foundation.org
> Cc: linux-arm-kernel@...ts.infradead.org
> Cc: linux-mediatek@...ts.infradead.org
> Cc: linux-kernel@...r.kernel.org

Reviewed-by: Matthias Brugger <mbrugger@...e.com>

> ---
>  drivers/iommu/mtk_iommu.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
> index de3e022..b66d11b 100644
> --- a/drivers/iommu/mtk_iommu.c
> +++ b/drivers/iommu/mtk_iommu.c
> @@ -632,16 +632,20 @@ static int mtk_iommu_probe(struct platform_device *pdev)
>  		if (!larbnode)
>  			return -EINVAL;
>  
> -		if (!of_device_is_available(larbnode))
> +		if (!of_device_is_available(larbnode)) {
> +			of_node_put(larbnode);
>  			continue;
> +		}
>  
>  		ret = of_property_read_u32(larbnode, "mediatek,larb-id", &id);
>  		if (ret)/* The id is consecutive if there is no this property */
>  			id = i;
>  
>  		plarbdev = of_find_device_by_node(larbnode);
> -		if (!plarbdev)
> +		if (!plarbdev) {
> +			of_node_put(larbnode);
>  			return -EPROBE_DEFER;
> +		}
>  		data->smi_imu.larb_imu[id].dev = &plarbdev->dev;
>  
>  		component_match_add_release(dev, &match, release_of,
>