diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-12-12 08:05:33 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-20 07:45:07 -0800 |
| commit | 223cc81c8c68c4c6b09cf8c024b1881084f29e5d (patch) | |
| tree | 50a21c1326f7c5a0ccd50c88613c9295d5b32c2c /drivers/hwmon/vt8231.c | |
| parent | e77a822f213aaa903e1aa9e5a5e4003b141d915c (diff) | |
| download | linux-3.10-223cc81c8c68c4c6b09cf8c024b1881084f29e5d.tar.gz linux-3.10-223cc81c8c68c4c6b09cf8c024b1881084f29e5d.tar.bz2 linux-3.10-223cc81c8c68c4c6b09cf8c024b1881084f29e5d.zip | |
hwmon: Prevent some divide by zeros in FAN_TO_REG()
commit 3806b45ba4655147a011df03242cc197ab986c43 upstream.
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>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hwmon/vt8231.c')
| -rw-r--r-- | drivers/hwmon/vt8231.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/vt8231.c b/drivers/hwmon/vt8231.c index 0e7017841f7..aee14e2192f 100644 --- a/drivers/hwmon/vt8231.c +++ b/drivers/hwmon/vt8231.c @@ -145,7 +145,7 @@ static const u8 regtempmin[] = { 0x3a, 0x3e, 0x2c, 0x2e, 0x30, 0x32 }; */ static inline u8 FAN_TO_REG(long rpm, int div) { - if (rpm == 0) + if (rpm <= 0 || rpm > 1310720) return 0; return clamp_val(1310720 / (rpm * div), 1, 255); } |