soc: qcom: ocmem: Fix missing put_device() call in of_get_ocmem

[PATCH] soc: qcom: ocmem: Fix missing put_device() call in of_get_ocmem

Posted by Miaoqian Lin 4 years, 5 months ago

The reference taken by 'of_find_device_by_node()' must be released when
not needed anymore.
Add the corresponding 'put_device()' in the error handling path.

Fixes: 01f937ffc468 ("soc: qcom: ocmem: don't return NULL in of_get_ocmem")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
---
 drivers/soc/qcom/ocmem.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/soc/qcom/ocmem.c b/drivers/soc/qcom/ocmem.c
index d2dacbbaafbd..97fd24c178f8 100644
--- a/drivers/soc/qcom/ocmem.c
+++ b/drivers/soc/qcom/ocmem.c
@@ -206,6 +206,7 @@ struct ocmem *of_get_ocmem(struct device *dev)
 	ocmem = platform_get_drvdata(pdev);
 	if (!ocmem) {
 		dev_err(dev, "Cannot get ocmem\n");
+		put_device(&pdev->dev);
 		return ERR_PTR(-ENODEV);
 	}
 	return ocmem;
-- 
2.17.1

Re: [PATCH] soc: qcom: ocmem: Fix missing put_device() call in of_get_ocmem

Posted by Bjorn Andersson 4 years, 4 months ago

On Fri 07 Jan 01:31 CST 2022, Miaoqian Lin wrote:

> The reference taken by 'of_find_device_by_node()' must be released when
> not needed anymore.
> Add the corresponding 'put_device()' in the error handling path.
> 
> Fixes: 01f937ffc468 ("soc: qcom: ocmem: don't return NULL in of_get_ocmem")
> Signed-off-by: Miaoqian Lin <linmq006@gmail.com>

Your patch solves the particular problem, so I'm applying it.

But it seems that we never release pdev in the case of successfully
return the ocmem object either... So there's more to improve here.

Regards,
Bjorn

> ---
>  drivers/soc/qcom/ocmem.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/soc/qcom/ocmem.c b/drivers/soc/qcom/ocmem.c
> index d2dacbbaafbd..97fd24c178f8 100644
> --- a/drivers/soc/qcom/ocmem.c
> +++ b/drivers/soc/qcom/ocmem.c
> @@ -206,6 +206,7 @@ struct ocmem *of_get_ocmem(struct device *dev)
>  	ocmem = platform_get_drvdata(pdev);
>  	if (!ocmem) {
>  		dev_err(dev, "Cannot get ocmem\n");
> +		put_device(&pdev->dev);
>  		return ERR_PTR(-ENODEV);
>  	}
>  	return ocmem;
> -- 
> 2.17.1
>

Re: [PATCH] soc: qcom: ocmem: Fix missing put_device() call in of_get_ocmem

Posted by Miaoqian Lin 4 years, 4 months ago

Hi, Andersson:

> Your patch solves the particular problem, so I'm applying it.
> 
> But it seems that we never release pdev in the case of successfully
> return the ocmem object either... So there's more to improve here.
> 
Thanks for your time. Should I submit another patch to release pdev 
in the regular path?

> >  drivers/soc/qcom/ocmem.c | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/drivers/soc/qcom/ocmem.c b/drivers/soc/qcom/ocmem.c
> > index d2dacbbaafbd..97fd24c178f8 100644
> > --- a/drivers/soc/qcom/ocmem.c
> > +++ b/drivers/soc/qcom/ocmem.c
> > @@ -206,6 +206,7 @@ struct ocmem *of_get_ocmem(struct device *dev)
> >  	ocmem = platform_get_drvdata(pdev);
> >  	if (!ocmem) {
> >  		dev_err(dev, "Cannot get ocmem\n");
> > +		put_device(&pdev->dev);
> >  		return ERR_PTR(-ENODEV);
> >  	}
> >  	return ocmem;
> > -- 
> > 2.17.1
> >

Re: (subset) [PATCH] soc: qcom: ocmem: Fix missing put_device() call in of_get_ocmem

Posted by Bjorn Andersson 4 years, 4 months ago

On Fri, 7 Jan 2022 07:31:26 +0000, Miaoqian Lin wrote:
> The reference taken by 'of_find_device_by_node()' must be released when
> not needed anymore.
> Add the corresponding 'put_device()' in the error handling path.
> 
> 

Applied, thanks!

[1/1] soc: qcom: ocmem: Fix missing put_device() call in of_get_ocmem
      commit: 0ff027027e05a866491bbb53494f0e2a61354c85

Best regards,
-- 
Bjorn Andersson <bjorn.andersson@linaro.org>