OSDN Git Service

power: supply: adp5061: Fix a couple off by ones
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 11 Jul 2018 07:58:13 +0000 (10:58 +0300)
committerSebastian Reichel <sebastian.reichel@collabora.co.uk>
Wed, 11 Jul 2018 10:00:24 +0000 (12:00 +0200)
We end up reading one element beyond the end of the adp5061_vmax[] array
here.

Fixes: fe8e81b7e899 ("adp5061: New driver for ADP5061 I2C battery charger")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
drivers/power/supply/adp5061.c

index c00a02e..939fd3d 100644 (file)
@@ -266,8 +266,8 @@ static int adp5061_get_max_voltage(struct adp5061_state *st,
                return ret;
 
        regval = ((regval & ADP5061_TERM_SET_VTRM_MSK) >> 2) - 0x0F;
-       if (regval > ARRAY_SIZE(adp5061_vmax))
-               regval = ARRAY_SIZE(adp5061_vmax);
+       if (regval >= ARRAY_SIZE(adp5061_vmax))
+               regval = ARRAY_SIZE(adp5061_vmax) - 1;
 
        val->intval = adp5061_vmax[regval] * 1000;
 
@@ -344,8 +344,8 @@ static int adp5061_get_const_chg_current(struct adp5061_state *st,
                return ret;
 
        regval = ((regval & ADP5061_CHG_CURR_ICHG_MSK) >> 2);
-       if (regval > ARRAY_SIZE(adp5061_const_ichg))
-               regval = ARRAY_SIZE(adp5061_const_ichg);
+       if (regval >= ARRAY_SIZE(adp5061_const_ichg))
+               regval = ARRAY_SIZE(adp5061_const_ichg) - 1;
 
        val->intval = adp5061_const_ichg[regval] * 1000;