hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hwmon: (adt7462) Fix overflows seen when writing into limit attributes 

Fix overflows seen when writing large values into temperature limit,
voltage limit, and pwm hysteresis attributes.

The input parameter to DIV_ROUND_CLOSEST() needs to be clamped to avoid
such overflows.

Reviewed-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Guenter Roeck 2016-12-03 11:09:55 -08:00
parent f1b9baa99b
commit b94793b4da
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/hwmon/adt7462.c
View File

@ -810,8 +810,8 @@ static ssize_t set_temp_min(struct device *dev,
if (kstrtol(buf, 10, &temp) || !temp_enabled(data, attr->index)) if (kstrtol(buf, 10, &temp) || !temp_enabled(data, attr->index))
return -EINVAL; return -EINVAL;
temp = clamp_val(temp, -64000, 191000);
temp = DIV_ROUND_CLOSEST(temp, 1000) + 64; temp = DIV_ROUND_CLOSEST(temp, 1000) + 64;
temp = clamp_val(temp, 0, 255);
mutex_lock(&data->lock); mutex_lock(&data->lock);
data->temp_min[attr->index] = temp; data->temp_min[attr->index] = temp;
@ -848,8 +848,8 @@ static ssize_t set_temp_max(struct device *dev,
if (kstrtol(buf, 10, &temp) || !temp_enabled(data, attr->index)) if (kstrtol(buf, 10, &temp) || !temp_enabled(data, attr->index))
return -EINVAL; return -EINVAL;
temp = clamp_val(temp, -64000, 191000);
temp = DIV_ROUND_CLOSEST(temp, 1000) + 64; temp = DIV_ROUND_CLOSEST(temp, 1000) + 64;
temp = clamp_val(temp, 0, 255);
mutex_lock(&data->lock); mutex_lock(&data->lock);
data->temp_max[attr->index] = temp; data->temp_max[attr->index] = temp;
@ -912,9 +912,9 @@ static ssize_t set_volt_max(struct device *dev,
if (kstrtol(buf, 10, &temp) || !x) if (kstrtol(buf, 10, &temp) || !x)
return -EINVAL; return -EINVAL;
temp = clamp_val(temp, 0, 255 * x / 1000);
temp *= 1000; /* convert mV to uV */ temp *= 1000; /* convert mV to uV */
temp = DIV_ROUND_CLOSEST(temp, x); temp = DIV_ROUND_CLOSEST(temp, x);
temp = clamp_val(temp, 0, 255);
mutex_lock(&data->lock); mutex_lock(&data->lock);
data->volt_max[attr->index] = temp; data->volt_max[attr->index] = temp;
@ -954,9 +954,9 @@ static ssize_t set_volt_min(struct device *dev,
if (kstrtol(buf, 10, &temp) || !x) if (kstrtol(buf, 10, &temp) || !x)
return -EINVAL; return -EINVAL;
temp = clamp_val(temp, 0, 255 * x / 1000);
temp *= 1000; /* convert mV to uV */ temp *= 1000; /* convert mV to uV */
temp = DIV_ROUND_CLOSEST(temp, x); temp = DIV_ROUND_CLOSEST(temp, x);
temp = clamp_val(temp, 0, 255);
mutex_lock(&data->lock); mutex_lock(&data->lock);
data->volt_min[attr->index] = temp; data->volt_min[attr->index] = temp;
@ -1220,8 +1220,8 @@ static ssize_t set_pwm_hyst(struct device *dev,
if (kstrtol(buf, 10, &temp)) if (kstrtol(buf, 10, &temp))
return -EINVAL; return -EINVAL;
temp = clamp_val(temp, 0, 15000);
temp = DIV_ROUND_CLOSEST(temp, 1000); temp = DIV_ROUND_CLOSEST(temp, 1000);
temp = clamp_val(temp, 0, 15);
/* package things up */ /* package things up */
temp &= ADT7462_PWM_HYST_MASK; temp &= ADT7462_PWM_HYST_MASK;
@ -1306,8 +1306,8 @@ static ssize_t set_pwm_tmin(struct device *dev,
if (kstrtol(buf, 10, &temp)) if (kstrtol(buf, 10, &temp))
return -EINVAL; return -EINVAL;
temp = clamp_val(temp, -64000, 191000);
temp = DIV_ROUND_CLOSEST(temp, 1000) + 64; temp = DIV_ROUND_CLOSEST(temp, 1000) + 64;
temp = clamp_val(temp, 0, 255);
mutex_lock(&data->lock); mutex_lock(&data->lock);
data->pwm_tmin[attr->index] = temp; data->pwm_tmin[attr->index] = temp;