linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Liam Beguin <liambeguin@gmail.com>
To: liambeguin@gmail.com, peda@axentia.se, jic23@kernel.org, lars@metafoo.de
Cc: linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org,
	devicetree@vger.kernel.org, robh+dt@kernel.org
Subject: [PATCH v10 09/14] iio: afe: rescale: reduce risk of integer overflow
Date: Sun, 19 Dec 2021 17:39:48 -0500	[thread overview]
Message-ID: <20211219223953.16074-10-liambeguin@gmail.com> (raw)
In-Reply-To: <20211219223953.16074-1-liambeguin@gmail.com>

From: Liam Beguin <lvb@xiphos.com>

Reduce the risk of integer overflow by doing the scale calculation on
a 64-bit integer. Since the rescaling is only performed on *val, reuse
the IIO_VAL_FRACTIONAL_LOG2 case.

Signed-off-by: Liam Beguin <lvb@xiphos.com>
---
 drivers/iio/afe/iio-rescale.c | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/drivers/iio/afe/iio-rescale.c b/drivers/iio/afe/iio-rescale.c
index 66306477aeab..4ab19a730a57 100644
--- a/drivers/iio/afe/iio-rescale.c
+++ b/drivers/iio/afe/iio-rescale.c
@@ -23,21 +23,31 @@ int rescale_process_scale(struct rescale *rescale, int scale_type,
 			  int *val, int *val2)
 {
 	s64 tmp;
+	int _val, _val2;
 	s32 rem, rem2;
 	u32 mult;
 	u32 neg;
 
 	switch (scale_type) {
-	case IIO_VAL_FRACTIONAL:
-		*val *= rescale->numerator;
-		*val2 *= rescale->denominator;
-		return scale_type;
 	case IIO_VAL_INT:
 		*val *= rescale->numerator;
 		if (rescale->denominator == 1)
 			return scale_type;
 		*val2 = rescale->denominator;
 		return IIO_VAL_FRACTIONAL;
+	case IIO_VAL_FRACTIONAL:
+		/*
+		 * When the product of both scales doesn't overflow, avoid
+		 * potential accuracy loss (for in kernel consumers) by
+		 * keeping a fractional representation.
+		 */
+		if (!check_mul_overflow(*val, rescale->numerator, &_val) &&
+		    !check_mul_overflow(*val2, rescale->denominator, &_val2)) {
+			*val = _val;
+			*val2 = _val2;
+			return IIO_VAL_FRACTIONAL;
+		}
+		fallthrough;
 	case IIO_VAL_FRACTIONAL_LOG2:
 		tmp = (s64)*val * 1000000000LL;
 		tmp = div_s64(tmp, rescale->denominator);
@@ -49,7 +59,10 @@ int rescale_process_scale(struct rescale *rescale, int scale_type,
 		if (!rem)
 			return scale_type;
 
-		tmp = 1 << *val2;
+		if (scale_type == IIO_VAL_FRACTIONAL)
+			tmp = *val2;
+		else
+			tmp = 1 << *val2;
 
 		rem2 = *val % (int)tmp;
 		*val = *val / (int)tmp;
-- 
2.34.0


  parent reply	other threads:[~2021-12-19 22:40 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-19 22:39 [PATCH v10 00/14] iio: afe: add temperature rescaling support Liam Beguin
2021-12-19 22:39 ` [PATCH v10 01/14] iio: inkern: apply consumer scale on IIO_VAL_INT cases Liam Beguin
2021-12-19 22:39 ` [PATCH v10 02/14] iio: inkern: apply consumer scale when no channel scale is available Liam Beguin
2021-12-19 22:39 ` [PATCH v10 03/14] iio: inkern: make a best effort on offset calculation Liam Beguin
2021-12-21  5:42   ` Andy Shevchenko
2021-12-21 17:50     ` Liam Beguin
2021-12-19 22:39 ` [PATCH v10 04/14] iio: afe: rescale: expose scale processing function Liam Beguin
     [not found]   ` <CAHp75VdfPf6FMvkGqhhQg5e5XE1cgE-K8seobe5n0yGarnPGtQ@mail.gmail.com>
2021-12-21  5:43     ` Andy Shevchenko
2021-12-22  2:28       ` Liam Beguin
2021-12-19 22:39 ` [PATCH v10 05/14] iio: afe: rescale: add INT_PLUS_{MICRO,NANO} support Liam Beguin
2021-12-19 22:39 ` [PATCH v10 06/14] iio: afe: rescale: add offset support Liam Beguin
2021-12-19 22:39 ` [PATCH v10 07/14] iio: afe: rescale: use s64 for temporary scale calculations Liam Beguin
2021-12-19 22:39 ` [PATCH v10 08/14] iio: afe: rescale: fix accuracy for small fractional scales Liam Beguin
2021-12-19 22:39 ` Liam Beguin [this message]
2021-12-19 22:39 ` [PATCH v10 10/14] iio: test: add basic tests for the iio-rescale driver Liam Beguin
2021-12-21  7:09   ` kernel test robot
2021-12-21  8:03   ` kernel test robot
2021-12-19 22:39 ` [PATCH v10 11/14] iio: afe: rescale: add RTD temperature sensor support Liam Beguin
2021-12-19 22:39 ` [PATCH v10 12/14] iio: afe: rescale: add temperature transducers Liam Beguin
2021-12-19 22:39 ` [PATCH v10 13/14] dt-bindings: iio: afe: add bindings for temperature-sense-rtd Liam Beguin
2021-12-19 22:39 ` [PATCH v10 14/14] dt-bindings: iio: afe: add bindings for temperature transducers Liam Beguin
2021-12-20 21:37 ` [PATCH v10 00/14] iio: afe: add temperature rescaling support Peter Rosin
2021-12-22  3:29   ` 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=20211219223953.16074-10-liambeguin@gmail.com \
    --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=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).