| Message ID | 1480913740-5678-11-git-send-email-linux@roeck-us.net (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Sun, 4 Dec 2016 20:55:34 -0800, Guenter Roeck wrote: > Writes into voltage limit attributes can overflow due to an unbound > multiplication. > > Signed-off-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/hwmon/lm85.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/hwmon/lm85.c b/drivers/hwmon/lm85.c > index 6ff773fcaefb..29c8136ce9c5 100644 > --- a/drivers/hwmon/lm85.c > +++ b/drivers/hwmon/lm85.c > @@ -136,7 +136,8 @@ static const int lm85_scaling[] = { /* .001 Volts */ > #define SCALE(val, from, to) (((val) * (to) + ((from) / 2)) / (from)) > > #define INS_TO_REG(n, val) \ > - clamp_val(SCALE(val, lm85_scaling[n], 192), 0, 255) > + SCALE(clamp_val(val, 0, 255 * lm85_scaling[n] / 192), \ > + lm85_scaling[n], 192) > > #define INSEXT_FROM_REG(n, val, ext) \ > SCALE(((val) << 4) + (ext), 192 << 4, lm85_scaling[n]) Reviewed-by: Jean Delvare <jdelvare@suse.de>
diff --git a/drivers/hwmon/lm85.c b/drivers/hwmon/lm85.c index 6ff773fcaefb..29c8136ce9c5 100644 --- a/drivers/hwmon/lm85.c +++ b/drivers/hwmon/lm85.c @@ -136,7 +136,8 @@ static const int lm85_scaling[] = { /* .001 Volts */ #define SCALE(val, from, to) (((val) * (to) + ((from) / 2)) / (from)) #define INS_TO_REG(n, val) \ - clamp_val(SCALE(val, lm85_scaling[n], 192), 0, 255) + SCALE(clamp_val(val, 0, 255 * lm85_scaling[n] / 192), \ + lm85_scaling[n], 192) #define INSEXT_FROM_REG(n, val, ext) \ SCALE(((val) << 4) + (ext), 192 << 4, lm85_scaling[n])
Writes into voltage limit attributes can overflow due to an unbound multiplication. Signed-off-by: Guenter Roeck <linux@roeck-us.net> --- drivers/hwmon/lm85.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)