lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Thu, 3 Sep 2020 11:04:40 +0800 From: Ikjoon Jang <ikjn@...omium.org> To: Sebastian Reichel <sre@...nel.org>, linux-pm@...r.kernel.org Cc: linux-kernel@...r.kernel.org, drinkcat@...omium.org, dianders@...omium.org, briannorris@...omium.org, Ikjoon Jang <ikjn@...omium.org> Subject: [PATCH] power: supply: sbs-battery: keep error code when get_property() fails Commit c4f382930145 (power: supply: sbs-battery: don't assume i2c errors as battery disconnect) overwrites the original error code returned from internal functions. On such a sporadic i2c error, a user will get a wrong value without errors. Fixes: c4f382930145 (power: supply: sbs-battery: don't assume i2c errors as battery disconnect) Signed-off-by: Ikjoon Jang <ikjn@...omium.org> --- Sorry, I missed an case with present state unchanged. Sebastian, if you're okay with this patch, I think this could be squashed into original commit c4f382930145 in your branch. --- drivers/power/supply/sbs-battery.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/drivers/power/supply/sbs-battery.c b/drivers/power/supply/sbs-battery.c index dacc4bc1c013..13192cbcce71 100644 --- a/drivers/power/supply/sbs-battery.c +++ b/drivers/power/supply/sbs-battery.c @@ -962,11 +962,10 @@ static int sbs_get_property(struct power_supply *psy, if (!chip->gpio_detect && chip->is_present != (ret >= 0)) { bool old_present = chip->is_present; union power_supply_propval val; - - ret = sbs_get_battery_presence_and_health( + int err = sbs_get_battery_presence_and_health( client, POWER_SUPPLY_PROP_PRESENT, &val); - sbs_update_presence(chip, !ret && val.intval); + sbs_update_presence(chip, !err && val.intval); if (old_present != chip->is_present) power_supply_changed(chip->power_supply); @@ -976,19 +975,14 @@ static int sbs_get_property(struct power_supply *psy, if (!ret) { /* Convert units to match requirements for power supply class */ sbs_unit_adjustment(client, psp, val); + dev_dbg(&client->dev, + "%s: property = %d, value = %x\n", __func__, + psp, val->intval); + } else if (!chip->is_present) { + /* battery not present, so return NODATA for properties */ + ret = -ENODATA; } - - dev_dbg(&client->dev, - "%s: property = %d, value = %x\n", __func__, psp, val->intval); - - if (ret && chip->is_present) - return ret; - - /* battery not present, so return NODATA for properties */ - if (ret) - return -ENODATA; - - return 0; + return ret; } static void sbs_supply_changed(struct sbs_info *chip) -- 2.28.0.402.g5ffc5be6b7-goog
Powered by blists - more mailing lists