Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93f0f572 authored by Guenter Roeck's avatar Guenter Roeck Committed by Greg Kroah-Hartman
Browse files

hwmon: (lm95234) Fix underflows seen when writing limit attributes 



[ Upstream commit af64e3e1537896337405f880c1e9ac1f8c0c6198 ]

DIV_ROUND_CLOSEST() after kstrtol() results in an underflow if a large
negative number such as -9223372036854775808 is provided by the user.
Fix it by reordering clamp_val() and DIV_ROUND_CLOSEST() operations.

Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 05419d00

drivers/hwmon/lm95234.c

+5 −4
Original line number Diff line number Diff line
@@ -310,7 +310,8 @@ static ssize_t set_tcrit2(struct device *dev, struct device_attribute *attr, 
	if (ret < 0)

		return ret;



	val = clamp_val(DIV_ROUND_CLOSEST(val, 1000), 0, index ? 255 : 127);

	val = DIV_ROUND_CLOSEST(clamp_val(val, 0, (index ? 255 : 127) * 1000),

				1000);



	mutex_lock(&data->update_lock);

	data->tcrit2[index] = val;
@@ -359,7 +360,7 @@ static ssize_t set_tcrit1(struct device *dev, struct device_attribute *attr, 
	if (ret < 0)

		return ret;



	val = clamp_val(DIV_ROUND_CLOSEST(val, 1000), 0, 255);

	val = DIV_ROUND_CLOSEST(clamp_val(val, 0, 255000), 1000);



	mutex_lock(&data->update_lock);

	data->tcrit1[index] = val;
@@ -400,7 +401,7 @@ static ssize_t set_tcrit1_hyst(struct device *dev, 
	if (ret < 0)

		return ret;



	val = DIV_ROUND_CLOSEST(val, 1000);

	val = DIV_ROUND_CLOSEST(clamp_val(val, -255000, 255000), 1000);

	val = clamp_val((int)data->tcrit1[index] - val, 0, 31);



	mutex_lock(&data->update_lock);
@@ -440,7 +441,7 @@ static ssize_t set_offset(struct device *dev, struct device_attribute *attr, 
		return ret;



	/* Accuracy is 1/2 degrees C */

	val = clamp_val(DIV_ROUND_CLOSEST(val, 500), -128, 127);

	val = DIV_ROUND_CLOSEST(clamp_val(val, -64000, 63500), 500);



	mutex_lock(&data->update_lock);

	data->toffset[index] = val;