i2c: i2c-mux-gpmux: Add of_node_put() when breaking out of loop
Subsystems (2)
PATCH 1/1 i2c: i2c-mux-gpmux: Add of_node_put() when breaking out of loop
In i2c_mux_probe(), we should call of_node_put() when breaking out of for_each_child_of_node() which will automatically increase and decrease the refcount.
--- drivers/i2c/muxes/i2c-mux-gpmux.c | 1 + 1 file changed, 1 insertion(+)
drivers/i2c/muxes/i2c-mux-gpmux.c +1 -0
@@ -115,6 +115,7 @@ static int i2c_mux_probe(struct platform_device *pdev)if (ret <0 ) {dev_err (dev,"no reg property for node '%pOFn'\n" , child); +of_node_put (child); goto err_children; }
Signature · 1 line
2.25.1
Hi!
Quoted 15 lines · Liang He
In
i2c_mux_probe(), we should callof_node_put()when breaking out offor_each_child_of_node()which will automatically increase and decrease the refcount.Fixes ac8498f0ce53 ("i2c: i2c-mux-gpmux: new driver")Signed-off-by Liang He <[email protected]>--- drivers/i2c/muxes/i2c-mux-gpmux.c | 1 + 1 file changed, 1 insertion(+)drivers/i2c/muxes/i2c-mux-gpmux.c +0
-0
drivers/i2c/muxes/i2c-mux-gpmux.c static int i2c_mux_probe(struct platform_device *pdev) · line 121
Quoted 7 lines
drivers/i2c/muxes/i2c-mux-gpmux.c +1
-0@@ -115,6 +115,7 @@ static int i2c_mux_probe(struct platform_device *pdev)if (ret <0 ) {dev_err (dev,"no reg property for node '%pOFn'\n" , child); +of_node_put (child); goto err_children; }
Right, but this is obviously incomplete. What about the other two branches in that loop that breaks out?
Much better to have the missing of_node_put(child) statement below theerr_children: label (i.e. before i2c_mux_del_adapters) so that it is not forgotten in any code flow. child cannot be uninitialized at that point and if it happens to be NULL, of_node_put will be a nop. So that's safe.
Cheers,
Peter
Quoted 29 lines · Peter Rosin
Hi!
Quoted 15 lines · Liang He
In
i2c_mux_probe(), we should callof_node_put()when breaking out offor_each_child_of_node()which will automatically increase and decrease the refcount.Fixes ac8498f0ce53 ("i2c: i2c-mux-gpmux: new driver")Signed-off-by Liang He <[email protected]>--- drivers/i2c/muxes/i2c-mux-gpmux.c | 1 + 1 file changed, 1 insertion(+)drivers/i2c/muxes/i2c-mux-gpmux.c +0
-0drivers/i2c/muxes/i2c-mux-gpmux.c static int i2c_mux_probe(struct platform_device *pdev) · line 121
Quoted 7 lines
drivers/i2c/muxes/i2c-mux-gpmux.c +1
-0@@ -115,6 +115,7 @@ static int i2c_mux_probe(struct platform_device *pdev)if (ret <0 ) {dev_err (dev,"no reg property for node '%pOFn'\n" , child); +of_node_put (child); goto err_children; }Right, but this is obviously incomplete. What about the other two branches in that loop that breaks out?
Quoted 7 lines
Much better to have the missing
of_node_put(child)statement below theerr_children: label (i.e. beforei2c_mux_del_adapters) so that it is not forgotten in any code flow. child cannot be uninitialized at that point and if it happens to be NULL,of_node_putwill be a nop. So that's safe.Cheers,
Peter
Thanks, Peter,
I have forgotten add of_node_put() in other fail path. But your advice is better, I will send a new version soon!
Thanks again,
Liang