pinctrl: spear: spear: Add of_node_put() before return
Subsystems (3)
PATCH 1/1 pinctrl: spear: spear: Add of_node_put() before return
Each iteration of for_each_child_of_node puts the previous node, but in the case of a return from the middle of the loop, there is no put, thus causing a memory leak. Hence add an of_node_put before the return in two places.
Issue found with Coccinelle.
--- drivers/pinctrl/spear/pinctrl-spear.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/pinctrl/spear/pinctrl-spear.c +6 -2
@@ -157,12 +157,16 @@ static int spear_pinctrl_dt_node_to_map(struct pinctrl_dev *pctldev,/* calculate number of maps required */ for_each_child_of_node (np_config, np) { ret =of_property_read_string (np,"st,function" , &function); -if (ret <0 ) +if (ret <0 ) { +of_node_put (np);return ret; + } ret =of_property_count_strings (np,"st,pins" ); -if (ret <0 ) +if (ret <0 ) { +of_node_put (np);return ret; + } count += ret; }
Signature · 1 line
2.19.1
Quoted 24 lines · Nishka Dasgupta
Each iteration of
for_each_child_of_nodeputs the previous node, but in the case of a return from the middle of the loop, there is no put, thus causing a memory leak. Hence add anof_node_putbefore the return in two places.
Issue found with Coccinelle.Signed-off-by Nishka Dasgupta <[email protected]>--- drivers/pinctrl/spear/pinctrl-spear.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/pinctrl/spear/pinctrl-spear.c +3
-1@@ -157,12 +157,16 @@ static int spear_pinctrl_dt_node_to_map(struct pinctrl_dev *pctldev,/* calculate number of maps required */ for_each_child_of_node (np_config, np) { ret =of_property_read_string (np,"st,function" , &function); -if (ret <0 ) +if (ret <0 ) { +of_node_put (np);return ret; + }
drivers/pinctrl/spear/pinctrl-spear.c static int spear_pinctrl_dt_node_to_map(struct pinctrl_dev *pctldev, · line 172
Quoted 10 lines
drivers/pinctrl/spear/pinctrl-spear.c +3
-1ret =of_property_count_strings (np,"st,pins" ); -if (ret <0 ) +if (ret <0 ) { +of_node_put (np);return ret; + } count += ret; }
Signature · 1 line
viresh
Quoted 7 lines · Nishka Dasgupta
Each iteration of
for_each_child_of_nodeputs the previous node, but in the case of a return from the middle of the loop, there is no put, thus causing a memory leak. Hence add anof_node_putbefore the return in two places.
Issue found with Coccinelle.Signed-off-by Nishka Dasgupta <[email protected]>
Patch applied with Viresh's ACK.
Yours,
Linus Walleij