clk: add missing of_node_put() in "assigned-clocks" property parsing
PATCH v2 1/1 clk: add missing of_node_put() in "assigned-clocks" property parsing
When returning from of_parse_phandle_with_args(), the np member of the of_phandle_args structure should be put after usage. Add missing of_node_put() calls in both __set_clk_parents() and __set_clk_rates().
---
v2:
- Add "Fixes"
drivers/clk/clk-conf.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/clk/clk-conf.c +10 -2
@@ -33,9 +33,12 @@ static int __set_clk_parents(struct device_node *node, bool clk_supplier)else return rc; } -if (clkspec.np == node && !clk_supplier) +if (clkspec.np == node && !clk_supplier) { +of_node_put (clkspec.np);return 0 ; + } pclk =of_clk_get_from_provider (&clkspec); +of_node_put (clkspec.np);if (IS_ERR (pclk)) {if (PTR_ERR (pclk) != -EPROBE_DEFER ) pr_warn("clk: couldn't get parent clock %d for %pOF\n",
@@ -48,10 +51,12 @@ static int __set_clk_parents(struct device_node *node, bool clk_supplier)if (rc <0 ) goto err;if (clkspec.np == node && !clk_supplier) { +of_node_put (clkspec.np); rc =0 ; goto err; } clk =of_clk_get_from_provider (&clkspec); +of_node_put (clkspec.np);if (IS_ERR (clk)) {if (PTR_ERR (clk) != -EPROBE_DEFER ) pr_warn("clk: couldn't get assigned clock %d for %pOF\n",
@@ -93,10 +98,13 @@ static int __set_clk_rates(struct device_node *node, bool clk_supplier)else return rc; } -if (clkspec.np == node && !clk_supplier) +if (clkspec.np == node && !clk_supplier) { +of_node_put (clkspec.np);return 0 ; + } clk =of_clk_get_from_provider (&clkspec); +of_node_put (clkspec.np);if (IS_ERR (clk)) {if (PTR_ERR (clk) != -EPROBE_DEFER ) pr_warn("clk: couldn't get clock %d for %pOF\n",
Signature · 1 line
2.39.0
Le Tue, 31 Jan 2023 09:32:27 +0100,
Clément Léger <[email protected]> a écrit :
Ping ?
Quoted 59 lines
When returning from
of_parse_phandle_with_args(), the np member of theof_phandle_argsstructure should be put after usage. Add missingof_node_put()calls in both__set_clk_parents()and__set_clk_rates().Fixes 86be408bfbd8 ("clk: Support for clock parents and rates assigned from device tree")Signed-off-by Clément Léger <[email protected]>---
v2:
- Add "Fixes"drivers/clk/clk-conf.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)drivers/clk/clk-conf.c +10
-2@@ -33,9 +33,12 @@ static int __set_clk_parents(struct device_node *node, bool clk_supplier)else return rc; } -if (clkspec.np == node && !clk_supplier) +if (clkspec.np == node && !clk_supplier) { +of_node_put (clkspec.np);return 0 ; + } pclk =of_clk_get_from_provider (&clkspec); +of_node_put (clkspec.np);if (IS_ERR (pclk)) {if (PTR_ERR (pclk) != -EPROBE_DEFER ) pr_warn("clk: couldn't get parent clock %d for %pOF\n",@@ -48,10 +51,12 @@ static int __set_clk_parents(struct device_node *node, bool clk_supplier)if (rc <0 ) goto err;if (clkspec.np == node && !clk_supplier) { +of_node_put (clkspec.np); rc =0 ; goto err; } clk =of_clk_get_from_provider (&clkspec); +of_node_put (clkspec.np);if (IS_ERR (clk)) {if (PTR_ERR (clk) != -EPROBE_DEFER ) pr_warn("clk: couldn't get assigned clock %d for %pOF\n",@@ -93,10 +98,13 @@ static int __set_clk_rates(struct device_node *node, bool clk_supplier)else return rc; } -if (clkspec.np == node && !clk_supplier) +if (clkspec.np == node && !clk_supplier) { +of_node_put (clkspec.np);return 0 ; + } clk =of_clk_get_from_provider (&clkspec); +of_node_put (clkspec.np);if (IS_ERR (clk)) {if (PTR_ERR (clk) != -EPROBE_DEFER ) pr_warn("clk: couldn't get clock %d for %pOF\n",
Signature · 3 lines
Clément Léger, Embedded Linux and Kernel engineer at Bootlin https://bootlin.com
Le Mon, 20 Feb 2023 12:44:20 +0100,
Clément Léger <[email protected]> a écrit :
Gentle ping.
Quoted 67 lines
Le Tue, 31 Jan 2023 09:32:27 +0100,
Clément Léger <[email protected]> a écrit :Ping ?
Quoted 59 lines
When returning from
of_parse_phandle_with_args(), the np member of theof_phandle_argsstructure should be put after usage. Add missingof_node_put()calls in both__set_clk_parents()and__set_clk_rates().Fixes 86be408bfbd8 ("clk: Support for clock parents and rates assigned from device tree")Signed-off-by Clément Léger <[email protected]>---
v2:
- Add "Fixes"drivers/clk/clk-conf.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)drivers/clk/clk-conf.c +10
-2@@ -33,9 +33,12 @@ static int __set_clk_parents(struct device_node *node, bool clk_supplier)else return rc; } -if (clkspec.np == node && !clk_supplier) +if (clkspec.np == node && !clk_supplier) { +of_node_put (clkspec.np);return 0 ; + } pclk =of_clk_get_from_provider (&clkspec); +of_node_put (clkspec.np);if (IS_ERR (pclk)) {if (PTR_ERR (pclk) != -EPROBE_DEFER ) pr_warn("clk: couldn't get parent clock %d for %pOF\n",@@ -48,10 +51,12 @@ static int __set_clk_parents(struct device_node *node, bool clk_supplier)if (rc <0 ) goto err;if (clkspec.np == node && !clk_supplier) { +of_node_put (clkspec.np); rc =0 ; goto err; } clk =of_clk_get_from_provider (&clkspec); +of_node_put (clkspec.np);if (IS_ERR (clk)) {if (PTR_ERR (clk) != -EPROBE_DEFER ) pr_warn("clk: couldn't get assigned clock %d for %pOF\n",@@ -93,10 +98,13 @@ static int __set_clk_rates(struct device_node *node, bool clk_supplier)else return rc; } -if (clkspec.np == node && !clk_supplier) +if (clkspec.np == node && !clk_supplier) { +of_node_put (clkspec.np);return 0 ; + } clk =of_clk_get_from_provider (&clkspec); +of_node_put (clkspec.np);if (IS_ERR (clk)) {if (PTR_ERR (clk) != -EPROBE_DEFER ) pr_warn("clk: couldn't get clock %d for %pOF\n",
Signature · 3 lines
Clément Léger, Embedded Linux and Kernel engineer at Bootlin https://bootlin.com
Stephen Boyd
maintainerQuoting Clément Léger (2023-01-31 00:32:27)
Quoted 7 lines
When returning from
of_parse_phandle_with_args(), the np member of theof_phandle_argsstructure should be put after usage. Add missingof_node_put()calls in both__set_clk_parents()and__set_clk_rates().Fixes 86be408bfbd8 ("clk: Support for clock parents and rates assigned from device tree")Signed-off-by Clément Léger <[email protected]>---
Does this series from a year ago help[1]?
[1] https://lore.kernel.org/all/[email protected]/
Nobody reviewed it, but if you can then I can probably apply it.
Quoted 9 lines · Stephen Boyd
Quoting Clément Léger (2023-01-31 00:32:27)
Quoted 7 lines
When returning from
of_parse_phandle_with_args(), the np member of theof_phandle_argsstructure should be put after usage. Add missingof_node_put()calls in both__set_clk_parents()and__set_clk_rates().Fixes 86be408bfbd8 ("clk: Support for clock parents and rates assigned from device tree")Signed-off-by Clément Léger <[email protected]>---
Quoted 5 lines
Does this series from a year ago help[1]?
[1] https://lore.kernel.org/all/[email protected]/
Nobody reviewed it, but if you can then I can probably apply it.
I'm only be able to review the first patch of the serie which is equivalent to what I did but it mixes refactoring and fixes.
Signature · 3 lines
Clément Léger, Embedded Linux and Kernel engineer at Bootlin https://bootlin.com
Quoting Clément Léger (2023-01-31 00:32:27)
Quoted 7 lines
When returning from
of_parse_phandle_with_args(), the np member of theof_phandle_argsstructure should be put after usage. Add missingof_node_put()calls in both__set_clk_parents()and__set_clk_rates().Fixes 86be408bfbd8 ("clk: Support for clock parents and rates assigned from device tree")Signed-off-by Clément Léger <[email protected]>---
Applied to clk-next