power: supply: bq25980: Fix uninitialized wd_reg_val and overrun
PATCH 1/1 power: supply: bq25980: Fix uninitialized wd_reg_val and overrun
Fix the issue when 'i' is equal to array size then array index over runs the array when checking for the watch dog value.
This also fixes the uninitialized wd_reg_val if the for..loop was not successful in finding an appropriate match.
--- drivers/power/supply/bq25980_charger.c | 29 +++++++++++++------------- 1 file changed, 15 insertions(+), 14 deletions(-)
drivers/power/supply/bq25980_charger.c +15 -14
@@ -1099,28 +1099,29 @@ static int bq25980_power_supply_init(struct bq25980_device *bq,static int bq25980_hw_init (struct bq25980_device *bq) {struct power_supply_battery_info bat_info = { }; -int wd_reg_val; +int wd_reg_val =BQ25980_WATCHDOG_DIS ; +int wd_max_val =BQ25980_NUM_WD_VAL -1 ;int ret =0 ;int curr_val;int volt_val;int i; -if (!bq->watchdog_timer) { - ret =regmap_update_bits (bq->regmap,BQ25980_CHRGR_CTRL_3 , -BQ25980_WATCHDOG_DIS , -BQ25980_WATCHDOG_DIS ); - }else { -for (i =0 ; i <BQ25980_NUM_WD_VAL ; i++) { -if (bq->watchdog_timer > bq25980_watchdog_time[i] && - bq->watchdog_timer < bq25980_watchdog_time[i +1 ]) { - wd_reg_val = i; -break ; +if (bq->watchdog_timer) { +if (bq->watchdog_timer >= bq25980_watchdog_time[wd_max_val]) + wd_reg_val = wd_max_val; +else { +for (i =0 ; i < wd_max_val; i++) { +if (bq->watchdog_timer > bq25980_watchdog_time[i] && + bq->watchdog_timer < bq25980_watchdog_time[i +1 ]) { + wd_reg_val = i; +break ; + } } } - - ret =regmap_update_bits (bq->regmap,BQ25980_CHRGR_CTRL_3 , -BQ25980_WATCHDOG_MASK , wd_reg_val); } + + ret =regmap_update_bits (bq->regmap,BQ25980_CHRGR_CTRL_3 , +BQ25980_WATCHDOG_MASK , wd_reg_val);if (ret)return ret;
Signature · 1 line
2.28.0.585.ge1cfff676549
Sebastian
Quoted 5 lines · Dan Murphy
Fix the issue when 'i' is equal to array size then array index over runs the array when checking for the watch dog value.
This also fixes the uninitialized
wd_reg_valif the for..loop was not successful in finding an appropriate match.
Might want to pull this into next as well this is a 0-day bug fix
Dan
Sebastian Reichel
maintainerHi Dan,
Quoted 8 lines · Dan Murphy
Quoted 5 lines · Dan Murphy
Fix the issue when 'i' is equal to array size then array index over runs the array when checking for the watch dog value.
This also fixes the uninitialized
wd_reg_valif the for..loop was not successful in finding an appropriate match.Might want to pull this into next as well this is a 0-day bug fix
Yes, merged now. I did not take it directly, since I had to rebase it first. Please always send power-supply patches based on the for-next branch, which already contained a fix for the uninitialized wd_reg_val.
(also no need to Cc DT people for this patch :))
-- Sebastian