summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Delaunay <patrick.delaunay@st.com>2020-09-10 18:18:16 +0200
committerTom Rini <trini@konsulko.com>2020-10-23 13:33:06 -0400
commit2d69b0861811711a27ac535fd8a611a9cdb68d43 (patch)
tree00b68e79d8ff6d1863ff1414499d56618990d37a
parent86eeac7bcf486de3f4182c2a084eff181b8c6e63 (diff)
downloadu-boot-2d69b0861811711a27ac535fd8a611a9cdb68d43.tar.gz
power: regulator: gpio-regulator: protect count value
Update the size of states_array to avoid overflow for dev_pdata->voltages[j] and dev_pdata->states[j]. As the size of array is GPIO_REGULATOR_MAX_STATES, the size of states_array is limited by GPIO_REGULATOR_MAX_STATES * 2 = 4 instead of 8 previously. The value of the "count" variable is limited by the third parameter of fdtdec_get_int_array_count. Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com> Reviewed-by: Simon Glass <sjg@chromium.org>
-rw-r--r--drivers/power/regulator/gpio-regulator.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/power/regulator/gpio-regulator.c b/drivers/power/regulator/gpio-regulator.c
index 947f812d09..017a3644fe 100644
--- a/drivers/power/regulator/gpio-regulator.c
+++ b/drivers/power/regulator/gpio-regulator.c
@@ -35,7 +35,7 @@ static int gpio_regulator_ofdata_to_platdata(struct udevice *dev)
const void *blob = gd->fdt_blob;
int node = dev_of_offset(dev);
int ret, count, i, j;
- u32 states_array[8];
+ u32 states_array[GPIO_REGULATOR_MAX_STATES * 2];
dev_pdata = dev_get_platdata(dev);
uc_pdata = dev_get_uclass_platdata(dev);
@@ -58,7 +58,8 @@ static int gpio_regulator_ofdata_to_platdata(struct udevice *dev)
debug("regulator gpio - not found! Error: %d", ret);
count = fdtdec_get_int_array_count(blob, node, "states",
- states_array, 8);
+ states_array,
+ ARRAY_SIZE(states_array));
if (!count)
return -EINVAL;