summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2014-07-31 22:27:04 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-05 16:28:35 -0700
commit5fafb69d9854a1b38ff0fe1b0058544b94702871 (patch)
tree63a050bc1e83025435030724b0d8875e0b054c3e
parent61d2b2bea78efae53eee7d47c20a0637a1099c26 (diff)
downloadlinux-stable-5fafb69d9854a1b38ff0fe1b0058544b94702871.tar.gz
linux-stable-5fafb69d9854a1b38ff0fe1b0058544b94702871.tar.bz2
linux-stable-5fafb69d9854a1b38ff0fe1b0058544b94702871.zip
hwmon: (sis5595) Prevent overflow problem when writing large limits
commit cc336546ddca8c22de83720632431c16a5f9fe9a upstream. On platforms with sizeof(int) < sizeof(long), writing a temperature limit larger than MAXINT will result in unpredictable limit values written to the chip. Avoid auto-conversion from long to int to fix the problem. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/hwmon/sis5595.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c
index 72a889702f0d..9ec7d2e2542c 100644
--- a/drivers/hwmon/sis5595.c
+++ b/drivers/hwmon/sis5595.c
@@ -159,7 +159,7 @@ static inline int TEMP_FROM_REG(s8 val)
{
return val * 830 + 52120;
}
-static inline s8 TEMP_TO_REG(int val)
+static inline s8 TEMP_TO_REG(long val)
{
int nval = clamp_val(val, -54120, 157530) ;
return nval < 0 ? (nval - 5212 - 415) / 830 : (nval - 5212 + 415) / 830;