]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
power: supply: da9150-fg: fix potential overflow
authorAndrey Vatoropin <a.vatoropin@crpt.ru>
Thu, 30 Jan 2025 09:00:34 +0000 (09:00 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 7 Mar 2025 15:56:37 +0000 (16:56 +0100)
[ Upstream commit 3fb3cb4350befc4f901c54e0cb4a2a47b1302e08 ]

Size of variable sd_gain equals four bytes - DA9150_QIF_SD_GAIN_SIZE.
Size of variable shunt_val equals two bytes - DA9150_QIF_SHUNT_VAL_SIZE.

The expression sd_gain * shunt_val is currently being evaluated using
32-bit arithmetic. So during the multiplication an overflow may occur.

As the value of type 'u64' is used as storage for the eventual result, put
ULL variable at the first position of each expression in order to give the
compiler complete information about the proper arithmetic to use. According
to C99 the guaranteed width for a variable of type 'unsigned long long' >=
64 bits.

Remove the explicit cast to u64 as it is meaningless.

Just for the sake of consistency, perform the similar trick with another
expression concerning 'iavg'.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Fixes: a419b4fd9138 ("power: Add support for DA9150 Fuel-Gauge")
Signed-off-by: Andrey Vatoropin <a.vatoropin@crpt.ru>
Link: https://lore.kernel.org/r/20250130090030.53422-1-a.vatoropin@crpt.ru
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/power/supply/da9150-fg.c

index 8c5e2c49d6c1c143e913530efff1243f88dceccf..9d0a6ab698f58bdbaf044e14dc2539a99e8013d6 100644 (file)
@@ -248,9 +248,9 @@ static int da9150_fg_current_avg(struct da9150_fg *fg,
                                      DA9150_QIF_SD_GAIN_SIZE);
        da9150_fg_read_sync_end(fg);
 
-       div = (u64) (sd_gain * shunt_val * 65536ULL);
+       div = 65536ULL * sd_gain * shunt_val;
        do_div(div, 1000000);
-       res = (u64) (iavg * 1000000ULL);
+       res = 1000000ULL * iavg;
        do_div(res, div);
 
        val->intval = (int) res;