aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2016-12-11 16:27:42 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-01-12 05:39:26 -0500
commit2aca9a4fe104e6e8d7ddca7042fe6d5379ead7f9 (patch)
treedce083f16b7d14ef5da9d6f7408a0cf1350f0d4f
parent81616a9f751e9b08a90d13c79e6ca73a74c4b446 (diff)
hwmon: (g762) Fix overflows and crash seen when writing limit attributes
commit 4fccd4a1e8944033bcd7693ea4e8fb478cd2059a upstream. Fix overflows seen when writing into fan speed limit attributes. Also fix crash due to division by zero, seen when certain very large values (such as 2147483648, or 0x80000000) are written into fan speed limit attributes. Fixes: 594fbe713bf60 ("Add support for GMT G762/G763 PWM fan controllers") Cc: Arnaud Ebalard <arno@natisbad.org> Reviewed-by: Jean Delvare <jdelvare@suse.de> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/hwmon/g762.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/hwmon/g762.c b/drivers/hwmon/g762.c
index b96a2a9e4df7..628be9c95ff9 100644
--- a/drivers/hwmon/g762.c
+++ b/drivers/hwmon/g762.c
@@ -193,14 +193,17 @@ static inline unsigned int rpm_from_cnt(u8 cnt, u32 clk_freq, u16 p,
193 * Convert fan RPM value from sysfs into count value for fan controller 193 * Convert fan RPM value from sysfs into count value for fan controller
194 * register (FAN_SET_CNT). 194 * register (FAN_SET_CNT).
195 */ 195 */
196static inline unsigned char cnt_from_rpm(u32 rpm, u32 clk_freq, u16 p, 196static inline unsigned char cnt_from_rpm(unsigned long rpm, u32 clk_freq, u16 p,
197 u8 clk_div, u8 gear_mult) 197 u8 clk_div, u8 gear_mult)
198{ 198{
199 if (!rpm) /* to stop the fan, set cnt to 255 */ 199 unsigned long f1 = clk_freq * 30 * gear_mult;
200 unsigned long f2 = p * clk_div;
201
202 if (!rpm) /* to stop the fan, set cnt to 255 */
200 return 0xff; 203 return 0xff;
201 204
202 return clamp_val(((clk_freq * 30 * gear_mult) / (rpm * p * clk_div)), 205 rpm = clamp_val(rpm, f1 / (255 * f2), ULONG_MAX / f2);
203 0, 255); 206 return DIV_ROUND_CLOSEST(f1, rpm * f2);
204} 207}
205 208
206/* helper to grab and cache data, at most one time per second */ 209/* helper to grab and cache data, at most one time per second */