samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

regulator: max20086: Fix refcount leak in max20086_parse_regulators_dt()

Browse Source 
[ Upstream commit 06118ae36855b7d3d22688298e74a766ccf0cb7a ]

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.

Fixes: 6b0cd72757c6 ("regulator: max20086: fix invalid memory access")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Link: https://patch.msgid.link/aDVRLqgJWMxYU03G@stanley.mountain
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Dan Carpenter
2025-05-27 08:44:14 +03:00
committed by Greg Kroah-Hartman
parent 6e32977114
commit de2adfaa95
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/regulator/max20086-regulator.c
View File

@@ -5,6 +5,7 @@
// Copyright (C) 2022 Laurent Pinchart <laurent.pinchart@idesonboard.com> // Copyright (C) 2022 Laurent Pinchart <laurent.pinchart@idesonboard.com>
// Copyright (C) 2018 Avnet, Inc. // Copyright (C) 2018 Avnet, Inc.
#include <linux/cleanup.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/gpio/consumer.h> #include <linux/gpio/consumer.h>
#include <linux/i2c.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) static int max20086_parse_regulators_dt(struct max20086 *chip, bool *boot_on)
{ {
struct of_regulator_match *matches; struct of_regulator_match *matches;
struct device_node *node;
unsigned int i; unsigned int i;
int ret; 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) { if (!node) {
dev_err(chip->dev, "regulators node not found\n"); dev_err(chip->dev, "regulators node not found\n");
return -ENODEV; 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, ret = of_regulator_match(chip->dev, node, matches,
chip->info->num_outputs); chip->info->num_outputs);
of_node_put(node);
if (ret < 0) { if (ret < 0) {
dev_err(chip->dev, "Failed to match regulators\n"); dev_err(chip->dev, "Failed to match regulators\n");
return -EINVAL; return -EINVAL;