hwmon (occ): Fix division by zero issue
PATCH 1/1 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.
Signed-off-by Lei YU <[email protected]>
Reviewed-by Eddie James <[email protected]>
--- drivers/hwmon/occ/common.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/hwmon/occ/common.c +4 -2
@@ -402,8 +402,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,
Signature · 1 line
2.7.4
Quoted 8 lines · Lei YU
The code in
occ_get_powr_avg()invokesdiv64_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.
Signed-off-by Lei YU <[email protected]>Reviewed-by Eddie James <[email protected]>
Applied.
Thanks,
Guenter
Quoted 21 lines
--- drivers/hwmon/occ/common.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/hwmon/occ/common.c +4
-2@@ -402,8 +402,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,