diff options
| author | Krzysztof Kozlowski <krzk@kernel.org> | 2019-06-19 15:42:39 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-26 10:12:56 +0300 |
| commit | a10d287f32d1d3fd34ce6c8c3e76ee71d8327f80 (patch) | |
| tree | b77c81bed28d5acf91508524766d8a1ff2590cb6 /drivers/regulator | |
| parent | c4ffc082c88cb6b212f752b84f2e586d3e8ee5d3 (diff) | |
| download | linux-a10d287f32d1d3fd34ce6c8c3e76ee71d8327f80.tar.xz | |
regulator: s2mps11: Fix ERR_PTR dereference on GPIO lookup failure
commit 70ca117b02f3b1c8830fe95e4e3dea2937038e11 upstream.
If devm_gpiod_get_from_of_node() call returns ERR_PTR, it is assigned
into an array of GPIO descriptors and used later because such error is
not treated as critical thus it is not propagated back to the probe
function.
All code later expects that such GPIO descriptor is either a NULL or
proper value. This later might lead to dereference of ERR_PTR.
Only devices with S2MPS14 flavor are affected (other do not control
regulators with GPIOs).
Fixes: 1c984942f0a4 ("regulator: s2mps11: Pass descriptor instead of GPIO number")
Cc: <stable@vger.kernel.org>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/s2mps11.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c index b518a81f75a3..209d1ff9089c 100644 --- a/drivers/regulator/s2mps11.c +++ b/drivers/regulator/s2mps11.c @@ -826,6 +826,7 @@ static void s2mps14_pmic_dt_parse_ext_control_gpio(struct platform_device *pdev, else if (IS_ERR(gpio[reg])) { dev_err(&pdev->dev, "Failed to get control GPIO for %d/%s\n", reg, rdata[reg].name); + gpio[reg] = NULL; continue; } if (gpio[reg]) |