diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-12-12 08:05:33 +0100 |
|---|---|---|
| committer | Jean Delvare <khali@endymion.delvare> | 2013-12-12 08:05:33 +0100 |
| commit | 3806b45ba4655147a011df03242cc197ab986c43 (patch) | |
| tree | 6f16fdaab2125caf51cd1c9b2fb9cd9e1eb3674f /drivers/hwmon/sis5595.c | |
| parent | 33a7ab91d509fa33b4bcd3ce0038cc80298050da (diff) | |
| download | op-kernel-dev-3806b45ba4655147a011df03242cc197ab986c43.zip op-kernel-dev-3806b45ba4655147a011df03242cc197ab986c43.tar.gz | |
hwmon: Prevent some divide by zeros in FAN_TO_REG()
The "rpm * div" operations can overflow here, so this patch adds an
upper limit to rpm to prevent that. Jean Delvare helped me with this
patch.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Roger Lucas <vt8231@hiddenengine.co.uk>
Cc: stable@vger.kernel.org
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/hwmon/sis5595.c')
| -rw-r--r-- | drivers/hwmon/sis5595.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c index 1404e63..72a8897 100644 --- a/drivers/hwmon/sis5595.c +++ b/drivers/hwmon/sis5595.c @@ -141,6 +141,8 @@ static inline u8 FAN_TO_REG(long rpm, int div) { if (rpm <= 0) return 255; + if (rpm > 1350000) + return 1; return clamp_val((1350000 + rpm * div / 2) / (rpm * div), 1, 254); } |
