Messages in this thread Patch in this message | | | From | Javier Martinez Canillas <> | Subject | [PATCH v2 2/2] regulator: core: Fix memory leak in regulator_resolve_supply() | Date | Wed, 15 Jul 2015 16:10:29 +0200 |
| |
The regulator_resolve_supply() function calls set_supply() which in turn calls create_regulator() to allocate a supply regulator.
If an error occurs after set_supply() succeeded, the allocated regulator has to be freed before propagating the error code.
Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
---
Changes in v2: - Add patch that increments the supply's module refcount in set_supply().
drivers/regulator/core.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 1dd2024b46b3..4d48c9615e4d 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -109,6 +109,7 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev, static struct regulator *create_regulator(struct regulator_dev *rdev, struct device *dev, const char *supply_name); +static void _regulator_put(struct regulator *regulator); static const char *rdev_get_name(struct regulator_dev *rdev) { @@ -1405,8 +1406,11 @@ static int regulator_resolve_supply(struct regulator_dev *rdev) /* Cascade always-on state to supply */ if (_regulator_is_enabled(rdev)) { ret = regulator_enable(rdev->supply); - if (ret < 0) + if (ret < 0) { + if (rdev->supply) + _regulator_put(rdev->supply); return ret; + } } return 0; -- 2.4.3
| |