lkml.org 
[lkml]   [2017]   [Apr]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] regulator: vctrl: Fix out of bounds array access for vctrl->vtable
Date
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>
---
drivers/regulator/vctrl-regulator.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/regulator/vctrl-regulator.c b/drivers/regulator/vctrl-regulator.c
index 6baadef..78de002 100644
--- a/drivers/regulator/vctrl-regulator.c
+++ b/drivers/regulator/vctrl-regulator.c
@@ -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;
--
2.9.3
\
 
 \ /
  Last update: 2017-04-14 04:51    [W:0.544 / U:0.012 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site