hwmon (occ): Fix integer overflow in multiplication
PATCH v2 1/1 hwmon (occ): Fix integer overflow in multiplication
From: "Edward A. James" <[email protected]>
Power values were overflowing INT_MAX when being converted to microwatts, even though the storage was sufficiently large (unsigned 64 bit). Change literals to unsigned long long.
Signed-off-by Edward A. James <[email protected]>
--- drivers/hwmon/occ/common.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/hwmon/occ/common.c +8 -8
@@ -393,7 +393,7 @@ static ssize_t occ_show_power_1(struct device *dev, struct device_attribute *attr, char *buf) { int rc; -u32 val =0 ; +u64 val =0 ;struct power_sensor_1 *power;struct occ *occ =dev_get_drvdata (dev);struct occ_sensors *sensors = &occ->sensors;
@@ -417,13 +417,13 @@ static ssize_t occ_show_power_1(struct device *dev,break ;case 3 :/* microwatts */ - val =get_unaligned_be16 (&power->value) *1000000 ; + val =get_unaligned_be16 (&power->value) *1000000ULL ;break ;default :return -EINVAL ; } -return snprintf (buf,PAGE_SIZE -1 ,"%u\n" , val); +return snprintf (buf,PAGE_SIZE -1 ,"%llu\n" , val); } static ssize_t occ_show_power_2(struct device *dev,
@@ -454,7 +454,7 @@ static ssize_t occ_show_power_2(struct device *dev,break ;case 3 :/* microwatts */ - val =get_unaligned_be16 (&power->value) *1000000 ; + val =get_unaligned_be16 (&power->value) *1000000ULL ;break ;case 4 : val = power->function_id;
@@ -496,7 +496,7 @@ static ssize_t occ_show_power_a0(struct device *dev,break ;case 3 :/* microwatts */ - val =get_unaligned_be16 (&power->system.value) *1000000 ; + val =get_unaligned_be16 (&power->system.value) *1000000ULL ;break ;case 4 : val =get_unaligned_be32 (&power->system.update_tag);
@@ -511,7 +511,7 @@ static ssize_t occ_show_power_a0(struct device *dev,break ;case 8 :/* microwatts */ - val =get_unaligned_be16 (&power->proc.value) *1000000 ; + val =get_unaligned_be16 (&power->proc.value) *1000000ULL ;break ;case 9 : val =get_unaligned_be32 (&power->proc.update_tag);
@@ -523,7 +523,7 @@ static ssize_t occ_show_power_a0(struct device *dev,return snprintf (buf,PAGE_SIZE -1 ,"vdd\n" );case 12 :/* microwatts */ - val =get_unaligned_be16 (&power->vdd.value) *1000000 ; + val =get_unaligned_be16 (&power->vdd.value) *1000000ULL ;break ;case 13 : val =get_unaligned_be32 (&power->vdd.update_tag);
@@ -535,7 +535,7 @@ static ssize_t occ_show_power_a0(struct device *dev,return snprintf (buf,PAGE_SIZE -1 ,"vdn\n" );case 16 :/* microwatts */ - val =get_unaligned_be16 (&power->vdn.value) *1000000 ; + val =get_unaligned_be16 (&power->vdn.value) *1000000ULL ;break ;case 17 : val =get_unaligned_be32 (&power->vdn.update_tag);
Signature · 1 line
1.8.3.1