linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v3] powerpc/fsl_rio: add missing of_node_put() in fsl_rio_setup()
@ 2022-11-24 14:33 Yang Yingliang
  2023-07-06  7:13 ` Christophe Leroy
  0 siblings, 1 reply; 2+ messages in thread
From: Yang Yingliang @ 2022-11-24 14:33 UTC (permalink / raw)
  To: linuxppc-dev, mpe, npiggin, christophe.leroy; +Cc: yangyingliang

The of node returned by of_find_compatible_node() with refcount
decremented, of_node_put() need be called after using it to avoid
refcount leak.

Fixes: abc3aeae3aaa ("fsl-rio: Add two ports and rapidio message units support")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
v2 -> v3:
  drop of_node_put() in loop for_each_child_of_node(), it's not needed.

v1 -> v2:
  Add fix tag.

v1 patch link:
  https://lore.kernel.org/lkml/20220615032137.1878219-1-yangyingliang@huawei.com/
---
 arch/powerpc/sysdev/fsl_rio.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c
index c8f044d62fe2..1ad962d3060e 100644
--- a/arch/powerpc/sysdev/fsl_rio.c
+++ b/arch/powerpc/sysdev/fsl_rio.c
@@ -550,12 +550,13 @@ int fsl_rio_setup(struct platform_device *dev)
 	if (!dt_range) {
 		pr_err("%pOF: unable to find 'reg' property\n",
 			np);
 		rc = -ENOMEM;
 		goto err_pw;
 	}
+	of_node_put(np);
 	range_start = of_read_number(dt_range, aw);
 	dbell->dbell_regs = (struct rio_dbell_regs *)(rmu_regs_win +
 				(u32)range_start);
 
 	/*set up port write node*/
 	np = of_find_compatible_node(NULL, NULL, "fsl,srio-port-write-unit");
@@ -578,12 +579,13 @@ int fsl_rio_setup(struct platform_device *dev)
 	if (!dt_range) {
 		pr_err("%pOF: unable to find 'reg' property\n",
 			np);
 		rc = -ENOMEM;
 		goto err;
 	}
+	of_node_put(np);
 	range_start = of_read_number(dt_range, aw);
 	pw->pw_regs = (struct rio_pw_regs *)(rmu_regs_win + (u32)range_start);
 
 	/*set up ports node*/
 	for_each_child_of_node(dev->dev.of_node, np) {
 		port_index = of_get_property(np, "cell-index", NULL);
@@ -760,12 +762,13 @@ int fsl_rio_setup(struct platform_device *dev)
 err_pw:
 	kfree(dbell);
 	dbell = NULL;
 err_dbell:
 	iounmap(rmu_regs_win);
 	rmu_regs_win = NULL;
+	of_node_put(np);
 err_rmu:
 	kfree(ops);
 err_ops:
 	iounmap(rio_regs_win);
 	rio_regs_win = NULL;
 err_rio_regs:
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH v3] powerpc/fsl_rio: add missing of_node_put() in fsl_rio_setup()
  2022-11-24 14:33 [PATCH v3] powerpc/fsl_rio: add missing of_node_put() in fsl_rio_setup() Yang Yingliang
@ 2023-07-06  7:13 ` Christophe Leroy
  0 siblings, 0 replies; 2+ messages in thread
From: Christophe Leroy @ 2023-07-06  7:13 UTC (permalink / raw)
  To: Yang Yingliang, linuxppc-dev, mpe, npiggin



Le 24/11/2022 à 15:33, Yang Yingliang a écrit :
> The of node returned by of_find_compatible_node() with refcount
> decremented, of_node_put() need be called after using it to avoid
> refcount leak.

Is that patch still required ? If yes, please rebase and resend.

Thanks
Christophe

> 
> Fixes: abc3aeae3aaa ("fsl-rio: Add two ports and rapidio message units support")
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
> ---
> v2 -> v3:
>    drop of_node_put() in loop for_each_child_of_node(), it's not needed.
> 
> v1 -> v2:
>    Add fix tag.
> 
> v1 patch link:
>    https://lore.kernel.org/lkml/20220615032137.1878219-1-yangyingliang@huawei.com/
> ---
>   arch/powerpc/sysdev/fsl_rio.c | 3 +++
>   1 file changed, 3 insertions(+)
> 
> diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c
> index c8f044d62fe2..1ad962d3060e 100644
> --- a/arch/powerpc/sysdev/fsl_rio.c
> +++ b/arch/powerpc/sysdev/fsl_rio.c
> @@ -550,12 +550,13 @@ int fsl_rio_setup(struct platform_device *dev)
>   	if (!dt_range) {
>   		pr_err("%pOF: unable to find 'reg' property\n",
>   			np);
>   		rc = -ENOMEM;
>   		goto err_pw;
>   	}
> +	of_node_put(np);
>   	range_start = of_read_number(dt_range, aw);
>   	dbell->dbell_regs = (struct rio_dbell_regs *)(rmu_regs_win +
>   				(u32)range_start);
>   
>   	/*set up port write node*/
>   	np = of_find_compatible_node(NULL, NULL, "fsl,srio-port-write-unit");
> @@ -578,12 +579,13 @@ int fsl_rio_setup(struct platform_device *dev)
>   	if (!dt_range) {
>   		pr_err("%pOF: unable to find 'reg' property\n",
>   			np);
>   		rc = -ENOMEM;
>   		goto err;
>   	}
> +	of_node_put(np);
>   	range_start = of_read_number(dt_range, aw);
>   	pw->pw_regs = (struct rio_pw_regs *)(rmu_regs_win + (u32)range_start);
>   
>   	/*set up ports node*/
>   	for_each_child_of_node(dev->dev.of_node, np) {
>   		port_index = of_get_property(np, "cell-index", NULL);
> @@ -760,12 +762,13 @@ int fsl_rio_setup(struct platform_device *dev)
>   err_pw:
>   	kfree(dbell);
>   	dbell = NULL;
>   err_dbell:
>   	iounmap(rmu_regs_win);
>   	rmu_regs_win = NULL;
> +	of_node_put(np);
>   err_rmu:
>   	kfree(ops);
>   err_ops:
>   	iounmap(rio_regs_win);
>   	rio_regs_win = NULL;
>   err_rio_regs:

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2023-07-06  7:15 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-24 14:33 [PATCH v3] powerpc/fsl_rio: add missing of_node_put() in fsl_rio_setup() Yang Yingliang
2023-07-06  7:13 ` Christophe Leroy

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).