2021-02-15 10:51:29

by angkery

Subject: [PATCH] pinctrl: stm32: add missing of_node_put

From: Junlin Yang <[email protected]>

Fix OF node leaks by calling of_node_put in
for_each_available_child_of_node when the cycle returns.

Generated by: scripts/coccinelle/iterators/for_each_child.cocci

Signed-off-by: Junlin Yang <[email protected]>
---
drivers/pinctrl/stm32/pinctrl-stm32.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c
index 7d9bded..da72e3e 100644
--- a/drivers/pinctrl/stm32/pinctrl-stm32.c
+++ b/drivers/pinctrl/stm32/pinctrl-stm32.c
@@ -1542,8 +1542,10 @@ int stm32_pctl_probe(struct platform_device *pdev)
if (of_property_read_bool(child, "gpio-controller")) {
bank->rstc = of_reset_control_get_exclusive(child,
NULL);
- if (PTR_ERR(bank->rstc) == -EPROBE_DEFER)
+ if (PTR_ERR(bank->rstc) == -EPROBE_DEFER) {
+ of_node_put(child);
return -EPROBE_DEFER;
+ }

bank->clk = of_clk_get_by_name(child, NULL);
if (IS_ERR(bank->clk)) {
@@ -1551,6 +1553,7 @@ int stm32_pctl_probe(struct platform_device *pdev)
dev_err(dev,
"failed to get clk (%ld)\n",
PTR_ERR(bank->clk));
+ of_node_put(child);
return PTR_ERR(bank->clk);
}
i++;
--
1.9.1

2021-02-15 14:00:56

by Fabien Dessenne

Subject: Re: [PATCH] pinctrl: stm32: add missing of_node_put

Resending in plain-text format.


On 15/02/2021 2:26 pm, foss wrote:
>
> Hi Junlin
>
>
> Thank you for the patch!
>
>
> Fabien
>
>
>> From: Junlin Yang<[email protected]>
>>
>> Fix OF node leaks by calling of_node_put in for_each_available_child_of_node when the cycle returns.
>>
>> Generated by: scripts/coccinelle/iterators/for_each_child.cocci
>>
>> Signed-off-by: Junlin Yang<[email protected]>
>
> Acked-by: Fabien Dessenne <[email protected]>
>
>
>> ---
>> drivers/pinctrl/stm32/pinctrl-stm32.c | 5 ++++-
>> 1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c
>> index 7d9bded..da72e3e 100644
>> --- a/drivers/pinctrl/stm32/pinctrl-stm32.c
>> +++ b/drivers/pinctrl/stm32/pinctrl-stm32.c
>> @@ -1542,8 +1542,10 @@ int stm32_pctl_probe(struct platform_device *pdev)
>> if (of_property_read_bool(child, "gpio-controller")) {
>> bank->rstc = of_reset_control_get_exclusive(child,
>> NULL);
>> - if (PTR_ERR(bank->rstc) == -EPROBE_DEFER)
>> + if (PTR_ERR(bank->rstc) == -EPROBE_DEFER) {
>> + of_node_put(child);
>> return -EPROBE_DEFER;
>> + }
>>
>> bank->clk = of_clk_get_by_name(child, NULL);
>> if (IS_ERR(bank->clk)) {
>> @@ -1551,6 +1553,7 @@ int stm32_pctl_probe(struct platform_device *pdev)
>> dev_err(dev,
>> "failed to get clk (%ld)\n",
>> PTR_ERR(bank->clk));
>> + of_node_put(child);
>> return PTR_ERR(bank->clk);
>> }
>> i++;
>> --
>> 1.9.1
>>

2021-03-02 21:26:30

by Linus Walleij

Subject: Re: [PATCH] pinctrl: stm32: add missing of_node_put

On Mon, Feb 15, 2021 at 11:41 AM angkery <[email protected]> wrote:

> From: Junlin Yang <[email protected]>
>
> Fix OF node leaks by calling of_node_put in
> for_each_available_child_of_node when the cycle returns.
>
> Generated by: scripts/coccinelle/iterators/for_each_child.cocci
>
> Signed-off-by: Junlin Yang <[email protected]>

Patch applied with Fabien's ACK!

Yours,
Linus Walleij