Patch "hwmon: (nct7802) Fix overflows seen when writing into limit attributes" has been added to the 4.4-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
hwmon: (nct7802) Fix overflows seen when writing into limit attributes
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
hwmon-nct7802-fix-overflows-seen-when-writing-into-limit-attributes.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
c0d04e9112ad59d73f23f3b0f6726c5e798dfcbfMon Sep 17 00:00:00 2001
From: Guenter Roeck <[email protected]>
Date: Sun, 4 Dec 2016 18:15:25 -0800
Subject: hwmon: (nct7802) Fix overflows seen when writing into limit attributes
From: Guenter Roeck <[email protected]>
commit c0d04e9112ad59d73f23f3b0f6726c5e798dfcbf upstream.
Fix overflows seen when writing voltage and temperature limit attributes.
The value passed to DIV_ROUND_CLOSEST() needs to be clamped, and the value parameter passed to nct7802_write_fan_min() is an unsigned long.
Also, writing values larger than 2700000 into a fan limit attribute results in writing 0 into the chip's limit registers. The exact behavior when writing this value is unspecified. For consistency, report a limit of 1350000 if the chip register reads 0. This may be wrong, and the chip behavior should be verified with the actual chip, but it is better than reporting a value of 0 (which, when written, results in writing a value of 0x1fff into the chip register).
--- drivers/hwmon/nct7802.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/hwmon/nct7802.c +5 -3
@@ -259,13 +259,15 @@ static int nct7802_read_fan_min(struct n ret =0 ; else if (ret) ret =DIV_ROUND_CLOSEST (1350000U , ret); + else + ret =1350000U ; abort:mutex_unlock (&data->access_lock);return ret; }static int nct7802_write_fan_min (struct nct7802_data *data,u8 reg_fan_low, -u8 reg_fan_high,unsigned int limit) +u8 reg_fan_high,unsigned long limit) {int err;
@@ -326,8 +328,8 @@ static int nct7802_write_voltage(structint shift =8 -REG_VOLTAGE_LIMIT_MSB_SHIFT [index -1 ][nr];int err; + voltage =clamp_val (voltage,0 ,0x3ff * nct7802_vmul[nr]); voltage =DIV_ROUND_CLOSEST (voltage, nct7802_vmul[nr]); - voltage =clamp_val (voltage,0 ,0x3ff );mutex_lock (&data->access_lock); err = regmap_write(data->regmap,
@@ -402,7 +404,7 @@ static ssize_t store_temp(struct deviceif (err <0 )return err; - val =clamp_val (DIV_ROUND_CLOSEST (val,1000 ),-128 ,127 ); + val =DIV_ROUND_CLOSEST (clamp_val (val,-128000 ,127000 ),1000 ); err =regmap_write (data->regmap, nr, val &0xff );return err ? : count;
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/hwmon-ds620-fix-overflows-seen-when-writing-temperature-limits.patch queue-4.4/hwmon-amc6821-sign-extension-temperature.patch queue-4.4/hwmon-scpi-fix-module-autoload.patch queue-4.4/hwmon-nct7802-fix-overflows-seen-when-writing-into-limit-attributes.patch queue-4.4/cris-only-build-flash-rescue-image-if-config_etrax_axisflashmap-is-selected.patch queue-4.4/hwmon-g762-fix-overflows-and-crash-seen-when-writing-limit-attributes.patch