]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
hwmon: (max16065) Fix overflows seen when writing limits
authorGuenter Roeck <linux@roeck-us.net>
Thu, 18 Jul 2024 16:52:01 +0000 (09:52 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 4 Oct 2024 14:32:39 +0000 (16:32 +0200)
[ Upstream commit 744ec4477b11c42e2c8de9eb8364675ae7a0bd81 ]

Writing large limits resulted in overflows as reported by module tests.

in0_lcrit: Suspected overflow: [max=5538, read 0, written 2147483647]
in0_crit: Suspected overflow: [max=5538, read 0, written 2147483647]
in0_min: Suspected overflow: [max=5538, read 0, written 2147483647]

Fix the problem by clamping prior to multiplications and the use of
DIV_ROUND_CLOSEST, and by using consistent variable types.

Reviewed-by: Tzung-Bi Shih <tzungbi@kernel.org>
Fixes: f5bae2642e3d ("hwmon: Driver for MAX16065 System Manager and compatibles")
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/hwmon/max16065.c

index aa38c45adc09e22122634697aab58506f29b00ae..e392529de098ef422dc5610c87fef836cbbc8e9a 100644 (file)
@@ -114,9 +114,10 @@ static inline int LIMIT_TO_MV(int limit, int range)
        return limit * range / 256;
 }
 
-static inline int MV_TO_LIMIT(int mv, int range)
+static inline int MV_TO_LIMIT(unsigned long mv, int range)
 {
-       return clamp_val(DIV_ROUND_CLOSEST(mv * 256, range), 0, 255);
+       mv = clamp_val(mv, 0, ULONG_MAX / 256);
+       return DIV_ROUND_CLOSEST(clamp_val(mv * 256, 0, range * 255), range);
 }
 
 static inline int ADC_TO_CURR(int adc, int gain)