power: regulator: gpio-regulator: protect count value
PATCH 1/2 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.
---
drivers/power/regulator/gpio-regulator.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/power/regulator/gpio-regulator.c +3 -2
@@ -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 ;
Signature · 1 line
2.17.1
PATCH 2/2 power: regulator: gpio-regulator: Convert to use APIs which support live DT
Use ofnode_ or dev_ APIs instead of fdt_ and fdtdec_ APIs so that the driver can support live DT.
---
drivers/power/regulator/gpio-regulator.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)
drivers/power/regulator/gpio-regulator.c +13 -9
@@ -18,8 +18,6 @@#define GPIO_REGULATOR_MAX_STATES 2 -DECLARE_GLOBAL_DATA_PTR ; -struct gpio_regulator_platdata {struct regulator_common_platdata common;struct gpio_desc gpio;/* GPIO for regulator voltage control */
@@ -32,8 +30,6 @@ static int gpio_regulator_ofdata_to_platdata(struct udevice *dev)struct dm_regulator_uclass_platdata *uc_pdata;struct gpio_regulator_platdata *dev_pdata;struct gpio_desc *gpio; -const void *blob = gd->fdt_blob; -int node =dev_of_offset (dev);int ret, count, i, j;u32 states_array[GPIO_REGULATOR_MAX_STATES *2 ];
@@ -57,12 +53,20 @@ static int gpio_regulator_ofdata_to_platdata(struct udevice *dev)if (ret)debug ("regulator gpio - not found! Error: %d" , ret); - count =fdtdec_get_int_array_count (blob, node,"states" , - states_array, -ARRAY_SIZE (states_array)); + ret =dev_read_size (dev,"states" ); +if (ret <0 ) +return ret; -if (!count) -return -EINVAL ; + count = ret /sizeof (states_array[0 ]); +if (count >ARRAY_SIZE (states_array)) { +debug ("regulator gpio - to many states (%d > %d)" , + count /2 ,GPIO_REGULATOR_MAX_STATES ); + count =ARRAY_SIZE (states_array); + } + + ret =dev_read_u32_array (dev,"states" , states_array, count); +if (ret <0 ) +return ret;for (i =0 , j =0 ; i < count; i +=2 ) { dev_pdata->voltages[j] = states_array[i];
Signature · 1 line
2.17.1
PATCH 2/2 power: regulator: gpio-regulator: Convert to use APIs which support live DT
Quoted 10 lines · Patrick Delaunay
Use
ofnode_ordev_APIs instead offdt_andfdtdec_APIs so that the driver can support live DT.Signed-off-by Patrick Delaunay <[email protected]>---
drivers/power/regulator/gpio-regulator.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)
PATCH 2/2 power: regulator: gpio-regulator: Convert to use APIs which support live DT
In reply to Patrick DelaunayQuoted 5 lines · Patrick Delaunay
Use
ofnode_ordev_APIs instead offdt_andfdtdec_APIs so that the driver can support live DT.Signed-off-by Patrick Delaunay <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201024/934df303/attachment.sig>
PATCH 1/2 power: regulator: gpio-regulator: protect count value
In reply to Patrick DelaunayQuoted 8 lines · Patrick Delaunay
Update the size of
states_arrayto avoid overflow for dev_pdata->voltages[j] and dev_pdata->states[j].As the size of array is
GPIO_REGULATOR_MAX_STATES, the size ofstates_arrayis limited byGPIO_REGULATOR_MAX_STATES* 2 = 4 instead of 8 previously.
Quoted 9 lines
The value of the "count" variable is limited by the third parameter of
fdtdec_get_int_array_count.Signed-off-by Patrick Delaunay <[email protected]>---
drivers/power/regulator/gpio-regulator.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
PATCH 1/2 power: regulator: gpio-regulator: protect count value
In reply to Patrick DelaunayQuoted 7 lines · Patrick Delaunay
Update the size of
states_arrayto avoid overflow for dev_pdata->voltages[j] and dev_pdata->states[j].As the size of array is
GPIO_REGULATOR_MAX_STATES, the size ofstates_arrayis limited byGPIO_REGULATOR_MAX_STATES* 2 = 4 instead of 8 previously.
Quoted 5 lines
The value of the "count" variable is limited by the third parameter of
fdtdec_get_int_array_count.Signed-off-by Patrick Delaunay <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201024/b7248f0a/attachment.sig>