65 lines
2.3 KiB
Diff
65 lines
2.3 KiB
Diff
From 0e933ffc049a0e181b5a6c3af1933976d6959ba9 Mon Sep 17 00:00:00 2001
|
|
From: Claudiu Beznea <claudiu.beznea@microchip.com>
|
|
Date: Wed, 25 Nov 2020 19:25:47 +0200
|
|
Subject: [PATCH 129/247] regulator: core: return zero for selectors lower than
|
|
linear_min_sel
|
|
|
|
Selectors lower than linear_min_sel should not be considered invalid.
|
|
Thus return zero in case _regulator_list_voltage(),
|
|
regulator_list_hardware_vsel() or regulator_list_voltage_table()
|
|
receives such selectors as argument.
|
|
|
|
Fixes: bdcd1177578c ("regulator: core: validate selector against linear_min_sel")
|
|
Reported-by: Jon Hunter <jonathanh@nvidia.com>
|
|
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
|
|
Link: https://lore.kernel.org/r/1606325147-606-1-git-send-email-claudiu.beznea@microchip.com
|
|
Signed-off-by: Mark Brown <broonie@kernel.org>
|
|
---
|
|
drivers/regulator/core.c | 10 ++++++----
|
|
drivers/regulator/helpers.c | 5 +++--
|
|
2 files changed, 9 insertions(+), 6 deletions(-)
|
|
|
|
--- a/drivers/regulator/core.c
|
|
+++ b/drivers/regulator/core.c
|
|
@@ -2987,9 +2987,10 @@ static int _regulator_list_voltage(struc
|
|
return rdev->desc->fixed_uV;
|
|
|
|
if (ops->list_voltage) {
|
|
- if (selector >= rdev->desc->n_voltages ||
|
|
- selector < rdev->desc->linear_min_sel)
|
|
+ if (selector >= rdev->desc->n_voltages)
|
|
return -EINVAL;
|
|
+ if (selector < rdev->desc->linear_min_sel)
|
|
+ return 0;
|
|
if (lock)
|
|
regulator_lock(rdev);
|
|
ret = ops->list_voltage(rdev, selector);
|
|
@@ -3139,9 +3140,10 @@ 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 ||
|
|
- selector < rdev->desc->linear_min_sel)
|
|
+ if (selector >= rdev->desc->n_voltages)
|
|
return -EINVAL;
|
|
+ if (selector < rdev->desc->linear_min_sel)
|
|
+ return 0;
|
|
if (ops->set_voltage_sel != regulator_set_voltage_sel_regmap)
|
|
return -EOPNOTSUPP;
|
|
|
|
--- a/drivers/regulator/helpers.c
|
|
+++ b/drivers/regulator/helpers.c
|
|
@@ -647,9 +647,10 @@ int regulator_list_voltage_table(struct
|
|
return -EINVAL;
|
|
}
|
|
|
|
- if (selector >= rdev->desc->n_voltages ||
|
|
- selector < rdev->desc->linear_min_sel)
|
|
+ if (selector >= rdev->desc->n_voltages)
|
|
return -EINVAL;
|
|
+ if (selector < rdev->desc->linear_min_sel)
|
|
+ return 0;
|
|
|
|
return rdev->desc->volt_table[selector];
|
|
}
|