2022-07-15 11:27:22

by Liang He

[permalink] [raw]
Subject: [PATCH] regulator: of: Fix refcount leak bug in of_get_regulation_constraints()

We should call the of_node_put() for the reference returned by
of_get_child_by_name() which has increased the refcount.

Fixes: 40e20d68bb3f ("regulator: of: Add support for parsing regulator_state for suspend state")
Signed-off-by: Liang He <[email protected]>
---
I think no matter what the 'suspend_state' value is, it should call
of_node_put() when 'suspend_np' is not NULL as it will be replaced
in 'continue' to next loop.

drivers/regulator/of_regulator.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
index f54d4f176882..e12b681c72e5 100644
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -264,8 +264,12 @@ static int of_get_regulation_constraints(struct device *dev,
}

suspend_np = of_get_child_by_name(np, regulator_states[i]);
- if (!suspend_np || !suspend_state)
+ if (!suspend_np)
continue;
+ if (!suspend_state) {
+ of_node_put(suspend_np);
+ continue;
+ }

if (!of_property_read_u32(suspend_np, "regulator-mode",
&pval)) {
--
2.25.1


2022-07-15 17:45:49

by Mark Brown

[permalink] [raw]
Subject: Re: [PATCH] regulator: of: Fix refcount leak bug in of_get_regulation_constraints()

On Fri, 15 Jul 2022 19:10:27 +0800, Liang He wrote:
> We should call the of_node_put() for the reference returned by
> of_get_child_by_name() which has increased the refcount.
>
>

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-next

Thanks!

[1/1] regulator: of: Fix refcount leak bug in of_get_regulation_constraints()
commit: 66efb665cd5ad69b27dca8571bf89fc6b9c628a4

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark