From: Jean Delvare <jdelvare@suse.de>
To: Guenter Roeck <linux@roeck-us.net>
Cc: Hardware Monitoring <linux-hwmon@vger.kernel.org>
Subject: Re: [PATCH 07/17] hwmon: (adt7462) Fix overflows seen when writing into limit attributes
Date: Thu, 8 Dec 2016 16:08:06 +0100 [thread overview]
Message-ID: <20161208160806.418fcf2b@endymion> (raw)
In-Reply-To: <1480913740-5678-7-git-send-email-linux@roeck-us.net>
On Sun, 4 Dec 2016 20:55:30 -0800, Guenter Roeck wrote:
> 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.
>
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> ---
> drivers/hwmon/adt7462.c | 14 ++++++--------
> 1 file changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/hwmon/adt7462.c b/drivers/hwmon/adt7462.c
> index 5929e126da63..0e9c8d3e8f5c 100644
> --- a/drivers/hwmon/adt7462.c
> +++ b/drivers/hwmon/adt7462.c
> @@ -810,8 +810,7 @@ static ssize_t set_temp_min(struct device *dev,
> if (kstrtol(buf, 10, &temp) || !temp_enabled(data, attr->index))
> return -EINVAL;
>
> - temp = DIV_ROUND_CLOSEST(temp, 1000) + 64;
> - temp = clamp_val(temp, 0, 255);
> + temp = DIV_ROUND_CLOSEST(clamp_val(temp, -64000, 191000), 1000) + 64;
>
> mutex_lock(&data->lock);
> data->temp_min[attr->index] = temp;
> @@ -848,8 +847,7 @@ static ssize_t set_temp_max(struct device *dev,
> if (kstrtol(buf, 10, &temp) || !temp_enabled(data, attr->index))
> return -EINVAL;
>
> - temp = DIV_ROUND_CLOSEST(temp, 1000) + 64;
> - temp = clamp_val(temp, 0, 255);
> + temp = DIV_ROUND_CLOSEST(clamp_val(temp, -64000, 191000), 1000) + 64;
>
> mutex_lock(&data->lock);
> data->temp_max[attr->index] = temp;
The original code had the division and the clamping on separate lines,
and I believe it makes the code more readable. It would also make the
patch smaller and more readable as well.
> @@ -912,6 +910,7 @@ static ssize_t set_volt_max(struct device *dev,
> if (kstrtol(buf, 10, &temp) || !x)
> return -EINVAL;
>
> + temp = clamp_val(temp, 0, INT_MAX / 1000 - x);
> temp *= 1000; /* convert mV to uV */
> temp = DIV_ROUND_CLOSEST(temp, x);
> temp = clamp_val(temp, 0, 255);
> @@ -954,6 +953,7 @@ static ssize_t set_volt_min(struct device *dev,
> if (kstrtol(buf, 10, &temp) || !x)
> return -EINVAL;
>
> + temp = clamp_val(temp, 0, INT_MAX / 1000 - x);
> temp *= 1000; /* convert mV to uV */
> temp = DIV_ROUND_CLOSEST(temp, x);
> temp = clamp_val(temp, 0, 255);
Any chance to get the new clamp_val()s such that the second ones are no
longer needed?
> @@ -1220,8 +1220,7 @@ static ssize_t set_pwm_hyst(struct device *dev,
> if (kstrtol(buf, 10, &temp))
> return -EINVAL;
>
> - temp = DIV_ROUND_CLOSEST(temp, 1000);
> - temp = clamp_val(temp, 0, 15);
> + temp = DIV_ROUND_CLOSEST(clamp_val(temp, 0, 15000), 1000);
>
> /* package things up */
> temp &= ADT7462_PWM_HYST_MASK;
> @@ -1306,8 +1305,7 @@ static ssize_t set_pwm_tmin(struct device *dev,
> if (kstrtol(buf, 10, &temp))
> return -EINVAL;
>
> - temp = DIV_ROUND_CLOSEST(temp, 1000) + 64;
> - temp = clamp_val(temp, 0, 255);
> + temp = DIV_ROUND_CLOSEST(clamp_val(temp, -64000, 191000), 1000) + 64;
>
> mutex_lock(&data->lock);
> data->pwm_tmin[attr->index] = temp;
Same comment as first 2.
--
Jean Delvare
SUSE L3 Support
next prev parent reply other threads:[~2016-12-08 15:08 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-05 4:55 [PATCH 01/17] hwmon: (adm9240) Fix overflows seen when writing into limit attributes Guenter Roeck
2016-12-05 4:55 ` [PATCH 02/17] hwmon: (ds620) Fix overflows seen when writing temperature limits Guenter Roeck
2016-12-08 13:47 ` Jean Delvare
2016-12-05 4:55 ` [PATCH 03/17] hwmon: (lm93) Fix overflows seen when writing into limit attributes Guenter Roeck
2016-12-13 14:01 ` Jean Delvare
2016-12-13 14:52 ` Guenter Roeck
2016-12-05 4:55 ` [PATCH 04/17] hwmon: (smsc47m192) " Guenter Roeck
2016-12-08 13:57 ` Jean Delvare
2016-12-08 19:24 ` Guenter Roeck
2016-12-05 4:55 ` [PATCH 05/17] hwmon: (adm1025) Fix overflows seen when writing voltage limits Guenter Roeck
2016-12-08 14:04 ` Jean Delvare
2016-12-05 4:55 ` [PATCH 06/17] hwmon: (adm1026) Fix overflows seen when writing into limit attributes Guenter Roeck
2016-12-08 14:33 ` Jean Delvare
2016-12-08 15:34 ` Guenter Roeck
2016-12-09 9:29 ` Jean Delvare
2016-12-05 4:55 ` [PATCH 07/17] hwmon: (adt7462) " Guenter Roeck
2016-12-08 15:08 ` Jean Delvare [this message]
2016-12-05 4:55 ` [PATCH 08/17] hwmon: (adt7470) " Guenter Roeck
2016-12-08 15:14 ` Jean Delvare
2016-12-08 18:14 ` Guenter Roeck
2016-12-05 4:55 ` [PATCH 09/17] hwmon: (nct7802) " Guenter Roeck
2016-12-09 9:49 ` Jean Delvare
2016-12-09 14:22 ` Guenter Roeck
2016-12-09 15:25 ` Jean Delvare
2016-12-09 18:11 ` Guenter Roeck
2016-12-05 4:55 ` [PATCH 10/17] hwmon: (lm87) Fix overflow seen when writing voltage " Guenter Roeck
2016-12-09 15:07 ` Jean Delvare
2016-12-05 4:55 ` [PATCH 11/17] hwmon: (lm85) Fix overflows " Guenter Roeck
2016-12-09 16:07 ` Jean Delvare
2016-12-05 4:55 ` [PATCH 12/17] hwmon: (dme1737) Fix overflows seen when writing into " Guenter Roeck
2016-12-12 9:33 ` Jean Delvare
2016-12-12 14:21 ` Guenter Roeck
2016-12-05 4:55 ` [PATCH 13/17] hwmon: (emc2103) Fix overflows seen when temperature " Guenter Roeck
2016-12-12 10:44 ` Jean Delvare
2016-12-05 4:55 ` [PATCH 14/17] hwmon: (emcw201) Fix overflows seen when writing into " Guenter Roeck
2016-12-12 10:48 ` Jean Delvare
2016-12-12 14:23 ` Guenter Roeck
2016-12-05 4:55 ` [PATCH 15/17] hwmln: (g762) Fix overflows and crash seen when writing " Guenter Roeck
2016-12-12 11:14 ` Jean Delvare
2016-12-12 14:19 ` Guenter Roeck
2016-12-05 4:55 ` [PATCH 16/17] hwmon: (gl518sm) Fix overflows seen when writing into " Guenter Roeck
2016-12-13 9:48 ` Jean Delvare
2016-12-13 21:56 ` Guenter Roeck
2016-12-05 4:55 ` [PATCH 17/17] hwmon: (gl520sm) " Guenter Roeck
2016-12-13 9:56 ` Jean Delvare
2016-12-13 14:49 ` Guenter Roeck
2016-12-08 13:29 ` [PATCH 01/17] hwmon: (adm9240) " Jean Delvare
2016-12-08 15:18 ` Guenter Roeck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161208160806.418fcf2b@endymion \
--to=jdelvare@suse.de \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux@roeck-us.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).