regulator: max20086: Fix refcount leak in max20086_parse_regulators_dt()
Subsystems (3)
PATCH 1/1 regulator: max20086: Fix refcount leak in max20086_parse_regulators_dt()
There is a missing call to of_node_put() if devm_kcalloc() fails. Fix this by changing the code to use cleanup.h magic to drop the refcount.
--- drivers/regulator/max20086-regulator.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/regulator/max20086-regulator.c +3 -3
@@ -5,6 +5,7 @@// Copyright (C) 2022 Laurent Pinchart <[email protected]> // Copyright (C) 2018 Avnet, Inc. +#include <linux/cleanup.h> #include <linux/err.h> #include <linux/gpio/consumer.h> #include <linux/i2c.h>
@@ -133,11 +134,11 @@ static int max20086_regulators_register(struct max20086 *chip)static int max20086_parse_regulators_dt (struct max20086 *chip,bool *boot_on) {struct of_regulator_match *matches; -struct device_node *node;unsigned int i;int ret; - node =of_get_child_by_name (chip->dev->of_node,"regulators" ); + struct device_node *node __free(device_node) = +of_get_child_by_name (chip->dev->of_node,"regulators" );if (!node) {dev_err (chip->dev,"regulators node not found\n" );return -ENODEV ;
@@ -153,7 +154,6 @@ static int max20086_parse_regulators_dt(struct max20086 *chip, bool *boot_on) ret =of_regulator_match (chip->dev, node, matches, chip->info->num_outputs); -of_node_put (node);if (ret <0 ) {dev_err (chip->dev,"Failed to match regulators\n" );return -EINVAL ;
Signature · 1 line
2.47.2
Hi Dan,
Thank you for the patch.
Quoted 6 lines · Dan Carpenter
There is a missing call to
of_node_put()ifdevm_kcalloc()fails. Fix this by changing the code to usecleanup.hmagic to drop the refcount.Fixes 6b0cd72757c6 ("regulator: max20086: fix invalid memory access")Signed-off-by Dan Carpenter <[email protected]>
Quoted 38 lines
--- drivers/regulator/max20086-regulator.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/regulator/max20086-regulator.c +3
-3@@ -5,6 +5,7 @@// Copyright (C) 2022 Laurent Pinchart <[email protected]> // Copyright (C) 2018 Avnet, Inc. +#include <linux/cleanup.h> #include <linux/err.h> #include <linux/gpio/consumer.h> #include <linux/i2c.h> @@ -133,11 +134,11 @@ static int max20086_regulators_register(struct max20086 *chip)static int max20086_parse_regulators_dt (struct max20086 *chip,bool *boot_on) {struct of_regulator_match *matches; -struct device_node *node;unsigned int i;int ret; - node =of_get_child_by_name (chip->dev->of_node,"regulators" ); + struct device_node *node __free(device_node) = +of_get_child_by_name (chip->dev->of_node,"regulators" );if (!node) {dev_err (chip->dev,"regulators node not found\n" );return -ENODEV ;@@ -153,7 +154,6 @@ static int max20086_parse_regulators_dt(struct max20086 *chip, bool *boot_on) ret =of_regulator_match (chip->dev, node, matches, chip->info->num_outputs); -of_node_put (node);if (ret <0 ) {dev_err (chip->dev,"Failed to match regulators\n" );return -EINVAL ;
Signature · 3 lines
Regards, Laurent Pinchart
Mark Brown
maintainerQuoted 5 lines · Dan Carpenter
There is a missing call to
of_node_put()ifdevm_kcalloc()fails. Fix this by changing the code to usecleanup.hmagic to drop the refcount.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-next
Thanks!
[1/1] regulator: max20086: Fix refcount leak in max20086_parse_regulators_dt()
commit: 06118ae36855b7d3d22688298e74a766ccf0cb7a
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