Message-ID: <e3644e19-7453-440b-00dc-781104ca83cf@foss.st.com>
Date:   Tue, 21 Mar 2023 10:00:03 +0100
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.8.0
Subject: Re: [PATCH 1/5] remoteproc: stm32: Call of_node_put() on iteration
 error
Content-Language: en-US
To:     Mathieu Poirier <mathieu.poirier@linaro.org>,
        <andersson@kernel.org>
CC:     <shawnguo@kernel.org>, <s.hauer@pengutronix.de>,
        <kernel@pengutronix.de>, <festevam@gmail.com>, <linux-imx@nxp.com>,
        <patrice.chotard@foss.st.com>, <mcoquelin.stm32@gmail.com>,
        <alexandre.torgue@foss.st.com>, <arnaud.pouliquen@st.com>,
        <hongxing.zhu@nxp.com>, <peng.fan@nxp.com>,
        <shengjiu.wang@nxp.com>, <linux-remoteproc@vger.kernel.org>,
        <linux-arm-kernel@lists.infradead.org>,
        <linux-kernel@vger.kernel.org>
References: <20230320221826.2728078-1-mathieu.poirier@linaro.org>
 <20230320221826.2728078-2-mathieu.poirier@linaro.org>
From:   Arnaud POULIQUEN <arnaud.pouliquen@foss.st.com>
Organization: STMicroelectronics
In-Reply-To: <20230320221826.2728078-2-mathieu.poirier@linaro.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
Precedence: bulk

Hi Mathieu,

On 3/20/23 23:18, Mathieu Poirier wrote:
> Function of_phandle_iterator_next() calls of_node_put() on the last
> device_node it iterated over, but when the loop exits prematurely it has
> to be called explicitly> 
> Fixes: 13140de09cc2 ("remoteproc: stm32: add an ST stm32_rproc driver")
> Cc: stable@vger.kernel.org
> Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
> ---
>  drivers/remoteproc/stm32_rproc.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/remoteproc/stm32_rproc.c b/drivers/remoteproc/stm32_rproc.c
> index 7d782ed9e589..23c1690b8d73 100644
> --- a/drivers/remoteproc/stm32_rproc.c
> +++ b/drivers/remoteproc/stm32_rproc.c
> @@ -223,11 +223,13 @@ static int stm32_rproc_prepare(struct rproc *rproc)
>  	while (of_phandle_iterator_next(&it) == 0) {
>  		rmem = of_reserved_mem_lookup(it.node);
>  		if (!rmem) {
> +			of_node_put(it.node);
>  			dev_err(dev, "unable to acquire memory-region\n");
>  			return -EINVAL;
>  		}
>  
>  		if (stm32_rproc_pa_to_da(rproc, rmem->base, &da) < 0) {
> +			of_node_put(it.node);
>  			dev_err(dev, "memory region not valid %pa\n",
>  				&rmem->base);
>  			return -EINVAL;
> @@ -254,8 +256,10 @@ static int stm32_rproc_prepare(struct rproc *rproc)
>  							   it.node->name);
>  		}
>  
> -		if (!mem)
> +		if (!mem) {
> +			of_node_put(it.node);
>  			return -ENOMEM;
> +		}

Good catch!

Looking in code I don't see that we call of_node_put() when we release the
carveouts. 
Please tell me if I'm wrong but look to me that we should also call of_node_put()
in mem->release() op, in drivers. 

This one remains valid.
reviewed-by: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>

Thanks,
Arnaud


>  
>  		rproc_add_carveout(rproc, mem);
>  		index++;