]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
power: supply: max17042_battery: Prevent int underflow in set_soc_threshold
authorSebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
Tue, 14 Sep 2021 12:18:06 +0000 (14:18 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 26 Nov 2021 10:58:36 +0000 (11:58 +0100)
commit e660dbb68c6b3f7b9eb8b9775846a44f9798b719 upstream.

max17042_set_soc_threshold gets called with offset set to 1, which means
that minimum threshold value would underflow once SOC got down to 0,
causing invalid alerts from the gauge.

Fixes: e5f3872d2044 ("max17042: Add support for signalling change in SOC")
Cc: <stable@vger.kernel.org>
Signed-off-by: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/power/max17042_battery.c

index f18d845b3b92d32656b50af1b4277cc71f64af35..7879a41afd574409f44f2b158df00486764e09d5 100644 (file)
@@ -752,7 +752,8 @@ static void max17042_set_soc_threshold(struct max17042_chip *chip, u16 off)
        regmap_read(map, MAX17042_RepSOC, &soc);
        soc >>= 8;
        soc_tr = (soc + off) << 8;
-       soc_tr |= (soc - off);
+       if (off < soc)
+               soc_tr |= soc - off;
        regmap_write(map, MAX17042_SALRT_Th, soc_tr);
 }