redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

regulator: core: fix possible NULL dereference 

We were checking rdev->supply for NULL after dereferencing it. Lets
check for rdev->supply along with _regulator_is_enabled() and call
regulator_enable() only if rdev->supply is not NULL.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
hifive-unleashed-5.1
Sudip Mukherjee 2015-09-02 16:14:06 +05:30 committed by Mark Brown
parent f5164b8833
commit 9f8df6adf6
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/regulator/core.c
View File

@ -1422,11 +1422,10 @@ static int regulator_resolve_supply(struct regulator_dev *rdev)
return ret;
/* Cascade always-on state to supply */
if (_regulator_is_enabled(rdev)) {
if (_regulator_is_enabled(rdev) && rdev->supply) {
ret = regulator_enable(rdev->supply);
if (ret < 0) {
if (rdev->supply)
_regulator_put(rdev->supply);
_regulator_put(rdev->supply);
return ret;
}
}