diff options
| author | Lei YU <mine260309@gmail.com> | 2019-07-11 04:44:48 +0200 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2019-07-22 04:18:45 +0200 |
| commit | 211186cae14de09573b062e478eb9fe215aed8d9 (patch) | |
| tree | 9c56f175357aa288925d6f09925182832c510599 /drivers | |
| parent | Linus 5.3-rc1 (diff) | |
| download | linux-211186cae14de09573b062e478eb9fe215aed8d9.tar.xz linux-211186cae14de09573b062e478eb9fe215aed8d9.zip | |
hwmon: (occ) Fix division by zero issue
The code in occ_get_powr_avg() invokes div64_u64() without checking the
divisor. In case the divisor is zero, kernel gets an "Division by zero
in kernel" error.
Check the divisor and make it return 0 if the divisor is 0.
Fixes: c10e753d43eb ("hwmon (occ): Add sensor types and versions")
Signed-off-by: Lei YU <mine260309@gmail.com>
Reviewed-by: Eddie James <eajames@linux.ibm.com>
Link: https://lore.kernel.org/r/1562813088-23708-1-git-send-email-mine260309@gmail.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hwmon/occ/common.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/hwmon/occ/common.c b/drivers/hwmon/occ/common.c index a7d2b16dd702..30e18eb60da7 100644 --- a/drivers/hwmon/occ/common.c +++ b/drivers/hwmon/occ/common.c @@ -408,8 +408,10 @@ static ssize_t occ_show_power_1(struct device *dev, static u64 occ_get_powr_avg(u64 *accum, u32 *samples) { - return div64_u64(get_unaligned_be64(accum) * 1000000ULL, - get_unaligned_be32(samples)); + u64 divisor = get_unaligned_be32(samples); + + return (divisor == 0) ? 0 : + div64_u64(get_unaligned_be64(accum) * 1000000ULL, divisor); } static ssize_t occ_show_power_2(struct device *dev, |