65 lines
2.3 KiB
Diff
65 lines
2.3 KiB
Diff
From 3aee4f22ed0a22d3d6d22fc49812c03d876c7637 Mon Sep 17 00:00:00 2001
|
|
From: Claudiu Beznea <claudiu.beznea@microchip.com>
|
|
Date: Fri, 13 Nov 2020 17:21:05 +0200
|
|
Subject: [PATCH 127/247] regulator: core: validate selector against
|
|
linear_min_sel
|
|
|
|
There are regulators who's min selector is not zero. Selectors loops
|
|
(looping b/w zero and regulator::desc::n_voltages) might throw errors
|
|
because invalid selectors are used (lower than
|
|
regulator::desc::linear_min_sel). For this situations validate selectors
|
|
against regulator::desc::linear_min_sel.
|
|
|
|
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
|
|
Link: https://lore.kernel.org/r/1605280870-32432-2-git-send-email-claudiu.beznea@microchip.com
|
|
Signed-off-by: Mark Brown <broonie@kernel.org>
|
|
---
|
|
drivers/regulator/core.c | 9 +++++++--
|
|
drivers/regulator/helpers.c | 3 ++-
|
|
2 files changed, 9 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/regulator/core.c
|
|
+++ b/drivers/regulator/core.c
|
|
@@ -2992,7 +2992,8 @@ static int _regulator_list_voltage(struc
|
|
return rdev->desc->fixed_uV;
|
|
|
|
if (ops->list_voltage) {
|
|
- if (selector >= rdev->desc->n_voltages)
|
|
+ if (selector >= rdev->desc->n_voltages ||
|
|
+ selector < rdev->desc->linear_min_sel)
|
|
return -EINVAL;
|
|
if (lock)
|
|
regulator_lock(rdev);
|
|
@@ -3143,7 +3144,8 @@ int regulator_list_hardware_vsel(struct
|
|
struct regulator_dev *rdev = regulator->rdev;
|
|
const struct regulator_ops *ops = rdev->desc->ops;
|
|
|
|
- if (selector >= rdev->desc->n_voltages)
|
|
+ if (selector >= rdev->desc->n_voltages ||
|
|
+ selector < rdev->desc->linear_min_sel)
|
|
return -EINVAL;
|
|
if (ops->set_voltage_sel != regulator_set_voltage_sel_regmap)
|
|
return -EOPNOTSUPP;
|
|
@@ -4066,6 +4068,9 @@ int regulator_set_voltage_time(struct re
|
|
|
|
for (i = 0; i < rdev->desc->n_voltages; i++) {
|
|
/* We only look for exact voltage matches here */
|
|
+ if (i < rdev->desc->linear_min_sel)
|
|
+ continue;
|
|
+
|
|
voltage = regulator_list_voltage(regulator, i);
|
|
if (voltage < 0)
|
|
return -EINVAL;
|
|
--- a/drivers/regulator/helpers.c
|
|
+++ b/drivers/regulator/helpers.c
|
|
@@ -647,7 +647,8 @@ int regulator_list_voltage_table(struct
|
|
return -EINVAL;
|
|
}
|
|
|
|
- if (selector >= rdev->desc->n_voltages)
|
|
+ if (selector >= rdev->desc->n_voltages ||
|
|
+ selector < rdev->desc->linear_min_sel)
|
|
return -EINVAL;
|
|
|
|
return rdev->desc->volt_table[selector];
|