From: "Liam Beguin" <liambeguin@gmail.com>
To: "Peter Rosin" <peda@axentia.se>, <jic23@kernel.org>,
<lars@metafoo.de>, <pmeerw@pmeerw.net>
Cc: <linux-kernel@vger.kernel.org>, <linux-iio@vger.kernel.org>,
<devicetree@vger.kernel.org>, <robh+dt@kernel.org>
Subject: Re: [PATCH v5 04/10] iio: afe: rescale: reduce risk of integer overflow
Date: Fri, 16 Jul 2021 12:46:24 -0400 [thread overview]
Message-ID: <CCUPTHKOCEWC.3NLHJ5ACINRYN@shaak> (raw)
In-Reply-To: <e83ee306-2421-c327-7627-18ae2a7928a8@axentia.se>
On Thu Jul 15, 2021 at 6:23 AM EDT, Peter Rosin wrote:
> On 2021-07-15 05:12, Liam Beguin wrote:
> > From: Liam Beguin <lvb@xiphos.com>
> >
> > Reduce the risk of integer overflow by doing the scale calculation with
> > 64bit integers and looking for a Greatest Common Divider for both parts
> > of the fractional value when required.
> >
> > Signed-off-by: Liam Beguin <lvb@xiphos.com>
> > ---
> > drivers/iio/afe/iio-rescale.c | 15 ++++++++++++---
> > 1 file changed, 12 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/iio/afe/iio-rescale.c b/drivers/iio/afe/iio-rescale.c
> > index 774eb3044edd..4c3cfd4d5181 100644
> > --- a/drivers/iio/afe/iio-rescale.c
> > +++ b/drivers/iio/afe/iio-rescale.c
> > @@ -39,7 +39,8 @@ static int rescale_read_raw(struct iio_dev *indio_dev,
> > int *val, int *val2, long mask)
> > {
> > struct rescale *rescale = iio_priv(indio_dev);
> > - unsigned long long tmp;
> > + s64 tmp, tmp2;
> > + u32 factor;
> > int ret;
> >
> > switch (mask) {
> > @@ -67,8 +68,16 @@ static int rescale_read_raw(struct iio_dev *indio_dev,
> > }
> > switch (ret) {
> > case IIO_VAL_FRACTIONAL:
> > - *val *= rescale->numerator;
> > - *val2 *= rescale->denominator;
> > + tmp = (s64)*val * rescale->numerator;
> > + tmp2 = (s64)*val2 * rescale->denominator;
> > + if (check_mul_overflow(*val, rescale->numerator, (s32 *)&tmp) ||
> > + check_mul_overflow(*val2, rescale->denominator, (s32 *)&tmp2)) {
Hi Peter,
>
> The white space should be like this, methinks.
>
> if (check_mul_overflow(*val, rescale->numerator, (s32 *)&tmp) ||
> check_mul_overflow(*val2, rescale->denominator, (s32 *)&tmp2))
> {
>
Sorry about that... Like I said in the cover letter, I'm working on
getting kunit tests running for the iio-rescale. At the moment it still
requires copying part of the code over and sure enough I forgot to copy
some of it back. My apologies for the noise...
This is what I meant to send:
case IIO_VAL_FRACTIONAL:
if (check_mul_overflow(*val, rescale->numerator, (s32 *)&tmp) ||
check_mul_overflow(*val2, rescale->denominator, (s32 *)&tmp2)) {
tmp = (s64)*val * rescale->numerator;
tmp2 = (s64)*val2 * rescale->denominator;
factor = gcd(tmp, tmp2);
do_div(tmp, factor);
do_div(tmp2, factor);
}
*val = tmp;
*val2 = tmp2;
return ret;
I'll also move the opening bracket on a new line if you prefer.
> > + factor = gcd(tmp, tmp2);
>
> And I just realized, gcd() works on unsigned values which is a bit safer
> for the
> scale factor. But here, for the actual values, more care is needed.
>
I added negative test cases to take this into account. I'll update and
resend. I'm going to find a way to get the test cases ready for the next
revision.
> > + do_div(tmp, factor);
> > + do_div(tmp2, factor);
> > + }
> > + *val = tmp;
> > + *val2 = tmp2;
>
> And beside the above points, the whole mechanism seems broken. The
> returned value
> in the third argument to check_mul_overflow isn't useful if there is an
> overflow.
> Yet, the code continues to use tmp and tmp2 in case of overflow. And why
> do you
> first multiply tmp and tmp2 without checks, only to then do the same mul
> again
> but with checks? Or have I completely misunderstood how
> check_mul_overflow
> works?
>
Again, my apologies for this. It's not what I meant to send.
Hopefully the snippet above makes more sense.
Thanks for your time,
Liam
> Cheers,
> Peter
>
> > return ret;
> > case IIO_VAL_INT:
> > *val *= rescale->numerator;
> >
next prev parent reply other threads:[~2021-07-16 16:46 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-15 3:12 [PATCH v5 00/10] iio: afe: add temperature rescaling support Liam Beguin
2021-07-15 3:12 ` [PATCH v5 01/10] iio: inkern: apply consumer scale on IIO_VAL_INT cases Liam Beguin
2021-07-15 3:12 ` [PATCH v5 02/10] iio: inkern: apply consumer scale when no channel scale is available Liam Beguin
2021-07-15 3:12 ` [PATCH v5 03/10] iio: inkern: make a best effort on offset calculation Liam Beguin
2021-07-15 3:12 ` [PATCH v5 04/10] iio: afe: rescale: reduce risk of integer overflow Liam Beguin
2021-07-15 10:23 ` Peter Rosin
2021-07-16 16:46 ` Liam Beguin [this message]
2021-07-15 3:12 ` [PATCH v5 05/10] iio: afe: rescale: add INT_PLUS_{MICRO,NANO} support Liam Beguin
2021-07-15 9:48 ` Peter Rosin
2021-07-16 19:18 ` Liam Beguin
2021-07-17 8:11 ` Peter Rosin
2021-07-17 16:55 ` Jonathan Cameron
2021-07-18 23:44 ` Liam Beguin
2021-07-19 8:31 ` Peter Rosin
2021-07-19 15:15 ` Liam Beguin
2021-07-15 3:12 ` [PATCH v5 06/10] iio: afe: rescale: add offset support Liam Beguin
2021-07-15 3:12 ` [PATCH v5 07/10] iio: afe: rescale: add RTD temperature sensor support Liam Beguin
2021-07-15 3:12 ` [PATCH v5 08/10] iio: afe: rescale: add temperature transducers Liam Beguin
2021-07-15 3:12 ` [PATCH v5 09/10] dt-bindings: iio: afe: add bindings for temperature-sense-rtd Liam Beguin
2021-07-15 3:12 ` [PATCH v5 10/10] dt-bindings: iio: afe: add bindings for temperature transducers Liam Beguin
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=CCUPTHKOCEWC.3NLHJ5ACINRYN@shaak \
--to=liambeguin@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=jic23@kernel.org \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peda@axentia.se \
--cc=pmeerw@pmeerw.net \
--cc=robh+dt@kernel.org \
/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).