diff mbox series

[v3] of: property: decrement node refcount in of_fwnode_get_reference_args()

Message ID 20221121023209.3909759-1-yangyingliang@huawei.com
State Accepted, archived
Headers show
Series [v3] of: property: decrement node refcount in of_fwnode_get_reference_args() | expand

Checks

Context Check Description
robh/checkpatch warning total: 0 errors, 1 warnings, 11 lines checked
robh/patch-applied fail build log
robh/checkpatch warning total: 0 errors, 1 warnings, 11 lines checked
robh/patch-applied fail build log

Commit Message

Yang Yingliang Nov. 21, 2022, 2:32 a.m. UTC
In of_fwnode_get_reference_args(), the refcount of of_args.np has
been incremented in the case of successful return from
of_parse_phandle_with_args() or of_parse_phandle_with_fixed_args().

Decrement the refcount if of_args is not returned to the caller of
of_fwnode_get_reference_args().

Fixes: 3e3119d3088f ("device property: Introduce fwnode_property_get_reference_args")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Reviewed-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Frank Rowand <frowand.list@gmail.com>
---
v1 -> v3:
  Update title and commit message that suggested by Frank.
---
 drivers/of/property.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Rob Herring (Arm) Nov. 22, 2022, 11:21 p.m. UTC | #1
On Mon, 21 Nov 2022 10:32:09 +0800, Yang Yingliang wrote:
> In of_fwnode_get_reference_args(), the refcount of of_args.np has
> been incremented in the case of successful return from
> of_parse_phandle_with_args() or of_parse_phandle_with_fixed_args().
> 
> Decrement the refcount if of_args is not returned to the caller of
> of_fwnode_get_reference_args().
> 
> Fixes: 3e3119d3088f ("device property: Introduce fwnode_property_get_reference_args")
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
> Reviewed-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> Reviewed-by: Frank Rowand <frowand.list@gmail.com>
> ---
> v1 -> v3:
>   Update title and commit message that suggested by Frank.
> ---
>  drivers/of/property.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 

Applied, thanks!
diff mbox series

Patch

diff --git a/drivers/of/property.c b/drivers/of/property.c
index 967f79b59016..134cfc980b70 100644
--- a/drivers/of/property.c
+++ b/drivers/of/property.c
@@ -993,8 +993,10 @@  of_fwnode_get_reference_args(const struct fwnode_handle *fwnode,
 						       nargs, index, &of_args);
 	if (ret < 0)
 		return ret;
-	if (!args)
+	if (!args) {
+		of_node_put(of_args.np);
 		return 0;
+	}
 
 	args->nargs = of_args.args_count;
 	args->fwnode = of_fwnode_handle(of_args.np);