diff options
| author | Wei Yongjun <weiyongjun1@huawei.com> | 2022-08-27 09:32:23 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2022-09-11 12:18:59 +0200 |
| commit | 9d47e01b9d807808224347935562f7043a358054 (patch) | |
| tree | c529c100f9605a713477c4e4662d260326988cb6 /drivers/power | |
| parent | power: supply: tps65217: Fix comments typo (diff) | |
| download | linux-9d47e01b9d807808224347935562f7043a358054.tar.xz linux-9d47e01b9d807808224347935562f7043a358054.zip | |
power: supply: adp5061: fix out-of-bounds read in adp5061_get_chg_type()
ADP5061_CHG_STATUS_1_CHG_STATUS is masked with 0x07, which means a length
of 8, but adp5061_chg_type array size is 4, may end up reading 4 elements
beyond the end of the adp5061_chg_type[] array.
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/supply/adp5061.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/power/supply/adp5061.c b/drivers/power/supply/adp5061.c index 003557043ab3..daee1161c305 100644 --- a/drivers/power/supply/adp5061.c +++ b/drivers/power/supply/adp5061.c @@ -427,11 +427,11 @@ static int adp5061_get_chg_type(struct adp5061_state *st, if (ret < 0) return ret; - chg_type = adp5061_chg_type[ADP5061_CHG_STATUS_1_CHG_STATUS(status1)]; - if (chg_type > ADP5061_CHG_FAST_CV) + chg_type = ADP5061_CHG_STATUS_1_CHG_STATUS(status1); + if (chg_type >= ARRAY_SIZE(adp5061_chg_type)) val->intval = POWER_SUPPLY_STATUS_UNKNOWN; else - val->intval = chg_type; + val->intval = adp5061_chg_type[chg_type]; return ret; } |