Skip to content

Commit 39e2a5b

Browse files
Sanman Pradhangroeck
authored andcommitted
hwmon: (occ) Fix division by zero in occ_show_power_1()
In occ_show_power_1() case 1, the accumulator is divided by update_tag without checking for zero. If no samples have been collected yet (e.g. during early boot when the sensor block is included but hasn't been updated), update_tag is zero, causing a kernel divide-by-zero crash. The 2019 fix in commit 211186c ("hwmon: (occ) Fix division by zero issue") only addressed occ_get_powr_avg() used by occ_show_power_2() and occ_show_power_a0(). This separate code path in occ_show_power_1() was missed. Fix this by reusing the existing occ_get_powr_avg() helper, which already handles the zero-sample case and uses mul_u64_u32_div() to multiply before dividing for better precision. Move the helper above occ_show_power_1() so it is visible at the call site. Fixes: c10e753 ("hwmon (occ): Add sensor types and versions") Cc: stable@vger.kernel.org Signed-off-by: Sanman Pradhan <psanman@juniper.net> Link: https://lore.kernel.org/r/20260326224510.294619-2-sanman.pradhan@hpe.com [groeck: Fix alignment problems reported by checkpatch] Signed-off-by: Guenter Roeck <linux@roeck-us.net>
1 parent ca34ee6 commit 39e2a5b

1 file changed

Lines changed: 8 additions & 9 deletions

File tree

drivers/hwmon/occ/common.c

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,12 @@ static ssize_t occ_show_freq_2(struct device *dev,
420420
return sysfs_emit(buf, "%u\n", val);
421421
}
422422

423+
static u64 occ_get_powr_avg(u64 accum, u32 samples)
424+
{
425+
return (samples == 0) ? 0 :
426+
mul_u64_u32_div(accum, 1000000UL, samples);
427+
}
428+
423429
static ssize_t occ_show_power_1(struct device *dev,
424430
struct device_attribute *attr, char *buf)
425431
{
@@ -441,9 +447,8 @@ static ssize_t occ_show_power_1(struct device *dev,
441447
val = get_unaligned_be16(&power->sensor_id);
442448
break;
443449
case 1:
444-
val = get_unaligned_be32(&power->accumulator) /
445-
get_unaligned_be32(&power->update_tag);
446-
val *= 1000000ULL;
450+
val = occ_get_powr_avg(get_unaligned_be32(&power->accumulator),
451+
get_unaligned_be32(&power->update_tag));
447452
break;
448453
case 2:
449454
val = (u64)get_unaligned_be32(&power->update_tag) *
@@ -459,12 +464,6 @@ static ssize_t occ_show_power_1(struct device *dev,
459464
return sysfs_emit(buf, "%llu\n", val);
460465
}
461466

462-
static u64 occ_get_powr_avg(u64 accum, u32 samples)
463-
{
464-
return (samples == 0) ? 0 :
465-
mul_u64_u32_div(accum, 1000000UL, samples);
466-
}
467-
468467
static ssize_t occ_show_power_2(struct device *dev,
469468
struct device_attribute *attr, char *buf)
470469
{

0 commit comments

Comments
 (0)