Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

regulator: vctrl: Fix out of bounds array access for vctrl->vtable

Browse source 
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.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Axel Lin 2017-04-14 10:50:43 +08:00 • committed by Mark Brown
parent 9dee7a72d0
commit a9bbb453b5
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/regulator/vctrl-regulator.c
View file

@ -345,9 +345,9 @@ static int vctrl_init_vtable(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
} }
vctrl->vtable = devm_kmalloc_array( vctrl->vtable = devm_kcalloc(&pdev->dev, rdesc->n_voltages,
&pdev->dev, sizeof(struct vctrl_voltage_table), sizeof(struct vctrl_voltage_table),
rdesc->n_voltages, GFP_KERNEL | __GFP_ZERO); GFP_KERNEL);
if (!vctrl->vtable) if (!vctrl->vtable)
return -ENOMEM; return -ENOMEM;
@ -371,7 +371,7 @@ static int vctrl_init_vtable(struct platform_device *pdev)
NULL); NULL);
/* pre-calculate OVP-safe downward transitions */ /* 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 j;
int ovp_min_uV = (vctrl->vtable[i].out * int ovp_min_uV = (vctrl->vtable[i].out *
(100 - vctrl->ovp_threshold)) / 100; (100 - vctrl->ovp_threshold)) / 100;