regulator: vctrl: Fix out of bounds array access for vctrl->vtable
PATCH 1/1 regulator: vctrl: Fix out of bounds array access for vctrl->vtable
Current code only allocates rdesc->n_voltages entries for vctrl->vtable. Thus use rdesc->n_voltages instead of n_voltages in the for loop.
While at it, also switch to use devm_kcalloc instead of devm_kmalloc_array
+ __GFP_ZERO flag and fix the argument order.
--- drivers/regulator/vctrl-regulator.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/regulator/vctrl-regulator.c +4 -4
@@ -345,9 +345,9 @@ static int vctrl_init_vtable(struct platform_device *pdev)return -EINVAL ; } - vctrl->vtable =devm_kmalloc_array ( - &pdev->dev,sizeof (struct vctrl_voltage_table ), - rdesc->n_voltages,GFP_KERNEL | __GFP_ZERO); + vctrl->vtable =devm_kcalloc (&pdev->dev, rdesc->n_voltages, +sizeof (struct vctrl_voltage_table ), +GFP_KERNEL );if (!vctrl->vtable)return -ENOMEM ;
@@ -371,7 +371,7 @@ static int vctrl_init_vtable(struct platform_device *pdev) NULL);/* pre-calculate OVP-safe downward transitions */ -for (i = n_voltages -1 ; i >0 ; i--) { +for (i = rdesc->n_voltages -1 ; i >0 ; i--) {int j;int ovp_min_uV = (vctrl->vtable[i].out * (100 - vctrl->ovp_threshold)) /100 ;
Signature · 1 line
2.9.3
Hi Axel,
El Fri, Apr 14, 2017 at 10:50:43AM +0800 Axel Lin ha dit:
Quoted 2 lines
Current code only allocates
rdesc->n_voltagesentries forvctrl->vtable. Thus userdesc->n_voltagesinstead ofn_voltagesin the for loop.
This is intended. n_voltages is the number of voltages of the control regulator. In the first loop of the function we determine how many of these voltages are usable by the vctrl regulator (=> rdesc->n_voltages). The loop that populates vctrl->vtable iterates over n_voltages, however it skips those that are outside of the voltage range for the control regulator.
Quoted 2 lines
While at it, also switch to use
devm_kcallocinstead ofdevm_kmalloc_array
+__GFP_ZEROflag and fix the argument order.
This looks good to me.
Thanks
Matthias
Quoted 31 lines
Signed-off-by Axel Lin <[email protected]>--- drivers/regulator/vctrl-regulator.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/regulator/vctrl-regulator.c +4
-4@@ -345,9 +345,9 @@ static int vctrl_init_vtable(struct platform_device *pdev)return -EINVAL ; } - vctrl->vtable =devm_kmalloc_array ( - &pdev->dev,sizeof (struct vctrl_voltage_table ), - rdesc->n_voltages,GFP_KERNEL | __GFP_ZERO); + vctrl->vtable =devm_kcalloc (&pdev->dev, rdesc->n_voltages, +sizeof (struct vctrl_voltage_table ), +GFP_KERNEL );if (!vctrl->vtable)return -ENOMEM ;@@ -371,7 +371,7 @@ static int vctrl_init_vtable(struct platform_device *pdev) NULL);/* pre-calculate OVP-safe downward transitions */ -for (i = n_voltages -1 ; i >0 ; i--) { +for (i = rdesc->n_voltages -1 ; i >0 ; i--) {int j;int ovp_min_uV = (vctrl->vtable[i].out * (100 - vctrl->ovp_threshold)) /100 ;
Matthias Kaehlcke
Reviewed-byEl Fri, Apr 14, 2017 at 10:11:37AM -0700 Matthias Kaehlcke ha dit:
Quoted 7 lines
Hi Axel,
El Fri, Apr 14, 2017 at 10:50:43AM +0800 Axel Lin ha dit:
Quoted 2 lines
Current code only allocates
rdesc->n_voltagesentries forvctrl->vtable. Thus userdesc->n_voltagesinstead ofn_voltagesin the for loop.
Quoted 6 lines
This is intended.
n_voltagesis the number of voltages of the control regulator. In the first loop of the function we determine how many of these voltages are usable by the vctrl regulator (=>rdesc->n_voltages). The loop that populatesvctrl->vtableiterates overn_voltages, however it skips those that are outside of the voltage range for the control regulator.
Sorry, I should have gotten coffee first. Your patch changes the pre-calc and not the population loop, the use of n_voltages there is indeed incorrect. Thanks for catching this!
Quoted 40 lines
Quoted 2 lines
While at it, also switch to use
devm_kcallocinstead ofdevm_kmalloc_array
+__GFP_ZEROflag and fix the argument order.This looks good to me.
Thanks
Matthias
Quoted 31 lines
Signed-off-by Axel Lin <[email protected]>--- drivers/regulator/vctrl-regulator.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/regulator/vctrl-regulator.c +4
-4@@ -345,9 +345,9 @@ static int vctrl_init_vtable(struct platform_device *pdev)return -EINVAL ; } - vctrl->vtable =devm_kmalloc_array ( - &pdev->dev,sizeof (struct vctrl_voltage_table ), - rdesc->n_voltages,GFP_KERNEL | __GFP_ZERO); + vctrl->vtable =devm_kcalloc (&pdev->dev, rdesc->n_voltages, +sizeof (struct vctrl_voltage_table ), +GFP_KERNEL );if (!vctrl->vtable)return -ENOMEM ;@@ -371,7 +371,7 @@ static int vctrl_init_vtable(struct platform_device *pdev) NULL);/* pre-calculate OVP-safe downward transitions */ -for (i = n_voltages -1 ; i >0 ; i--) { +for (i = rdesc->n_voltages -1 ; i >0 ; i--) {int j;int ovp_min_uV = (vctrl->vtable[i].out * (100 - vctrl->ovp_threshold)) /100 ;
Mark Brown
maintainerApplied "regulator: vctrl: Fix out of bounds array access for vctrl->vtable" to the regulator tree
In reply to Axel LinThe patch
regulator: vctrl: Fix out of bounds array access for vctrl->vtable
has been applied to the regulator tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
a9bbb453b50c91295ab362e4832eb37fd4e6785dMon Sep 17 00:00:00 2001
From: Axel Lin <[email protected]>
Date: Fri, 14 Apr 2017 10:50:43 +0800
Subject: [PATCH] regulator: vctrl: Fix out of bounds array access for
vctrl->vtable
Current code only allocates rdesc->n_voltages entries for vctrl->vtable. Thus use rdesc->n_voltages instead of n_voltages in the for loop.
While at it, also switch to use devm_kcalloc instead of devm_kmalloc_array
+ __GFP_ZERO flag and fix the argument order.
--- drivers/regulator/vctrl-regulator.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/regulator/vctrl-regulator.c +4 -4
@@ -345,9 +345,9 @@ static int vctrl_init_vtable(struct platform_device *pdev)return -EINVAL ; } - vctrl->vtable =devm_kmalloc_array ( - &pdev->dev,sizeof (struct vctrl_voltage_table ), - rdesc->n_voltages,GFP_KERNEL | __GFP_ZERO); + vctrl->vtable =devm_kcalloc (&pdev->dev, rdesc->n_voltages, +sizeof (struct vctrl_voltage_table ), +GFP_KERNEL );if (!vctrl->vtable)return -ENOMEM ;
@@ -371,7 +371,7 @@ static int vctrl_init_vtable(struct platform_device *pdev) NULL);/* pre-calculate OVP-safe downward transitions */ -for (i = n_voltages -1 ; i >0 ; i--) { +for (i = rdesc->n_voltages -1 ; i >0 ; i--) {int j;int ovp_min_uV = (vctrl->vtable[i].out * (100 - vctrl->ovp_threshold)) /100 ;
Signature · 1 line
2.11.0