Received-SPF: pass (google.com: domain of linux-kernel+bounces-163929-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Tue, 30 Apr 2024 15:44:53 +0300
From: Matti Vaittinen <mazziesaccount@gmail.com>
To: Matti Vaittinen <mazziesaccount@gmail.com>,
	Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
Cc: Matti Vaittinen <mazziesaccount@gmail.com>,
	Jonathan Cameron <jic23@kernel.org>,
	Lars-Peter Clausen <lars@metafoo.de>, linux-iio@vger.kernel.org,
	linux-kernel@vger.kernel.org, Chenyuan Yang <chenyuan0y@gmail.com>
Subject: [PATCH v2 1/2] iio: Fix the sorting functionality in
 iio_gts_build_avail_time_table
Message-ID: <d501ade8c1f7b202d34c6404eda423489cab1df5.1714480171.git.mazziesaccount@gmail.com>
References: <cover.1714480171.git.mazziesaccount@gmail.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
	protocol="application/pgp-signature"; boundary="E2t63QxdjNRo5mou"
Content-Disposition: inline
In-Reply-To: <cover.1714480171.git.mazziesaccount@gmail.com>


--E2t63QxdjNRo5mou
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

=46rom: Chenyuan Yang <chenyuan0y@gmail.com>

The sorting in iio_gts_build_avail_time_table is not working as intended.
It could result in an out-of-bounds access when the time is zero.

Here are more details:

1. When the gts->itime_table[i].time_us is zero, e.g., the time
sequence is `3, 0, 1`, the inner for-loop will not terminate and do
out-of-bound writes. This is because once `times[j] > new`, the value
`new` will be added in the current position and the `times[j]` will be
moved to `j+1` position, which makes the if-condition always hold.
Meanwhile, idx will be added one, making the loop keep running without
termination and out-of-bound write.
2. If none of the gts->itime_table[i].time_us is zero, the elements
will just be copied without being sorted as described in the comment
"Sort times from all tables to one and remove duplicates".

For more details, please refer to
https://lore.kernel.org/all/6dd0d822-046c-4dd2-9532-79d7ab96ec05@gmail.com.

Reported-by: Chenyuan Yang <chenyuan0y@gmail.com>
Suggested-by: Matti Vaittinen <mazziesaccount@gmail.com>
Fixes: 38416c28e168 ("iio: light: Add gain-time-scale helpers")
Signed-off-by: Chenyuan Yang <chenyuan0y@gmail.com>
Co-developed-by: Matti Vaittinen <mazziesaccount@gmail.com>
Signed-off-by: Matti Vaittinen <mazziesaccount@gmail.com>

---
Revision history:
v1 =3D> v2:
 - Fix the sender and From: tag
 - Drop the Co-developed-by tag from original author

Original commit (by Chenyuan Yang) was amended by me to remove duplicates
so that the user-space callers do not get multiple instances of same time
as was discussed here:
https://lore.kernel.org/all/a59061f8-5caa-43d4-bd4f-5ac4c39515ba@gmail.com/
---
 drivers/iio/industrialio-gts-helper.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/iio/industrialio-gts-helper.c b/drivers/iio/industrial=
io-gts-helper.c
index b51eb6cb766f..59d7615c0f56 100644
--- a/drivers/iio/industrialio-gts-helper.c
+++ b/drivers/iio/industrialio-gts-helper.c
@@ -362,17 +362,20 @@ static int iio_gts_build_avail_time_table(struct iio_=
gts *gts)
 	for (i =3D gts->num_itime - 1; i >=3D 0; i--) {
 		int new =3D gts->itime_table[i].time_us;
=20
-		if (times[idx] < new) {
+		if (idx =3D=3D 0 || times[idx - 1] < new) {
 			times[idx++] =3D new;
 			continue;
 		}
=20
-		for (j =3D 0; j <=3D idx; j++) {
+		for (j =3D 0; j < idx; j++) {
+			if (times[j] =3D=3D new)
+				break;
 			if (times[j] > new) {
 				memmove(&times[j + 1], &times[j],
 					(idx - j) * sizeof(int));
 				times[j] =3D new;
 				idx++;
+				break;
 			}
 		}
 	}
--=20
2.44.0


--=20
Matti Vaittinen, Linux device drivers
ROHM Semiconductors, Finland SWDC
Kiviharjunlenkki 1E
90220 OULU
FINLAND

~~~ "I don't think so," said Rene Descartes. Just then he vanished ~~~
Simon says - in Latin please.
~~~ "non cogito me" dixit Rene Descarte, deinde evanescavit ~~~
Thanks to Simon Glass for the translation =3D]=20

--E2t63QxdjNRo5mou
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEIx+f8wZb28fLKEhTeFA3/03aocUFAmYw58UACgkQeFA3/03a
ocUbfgf8CymJGtBydXuTd8iEdYjOISBsHEBN19bV566o5F/1UbymyKE4nfsky3nE
zfDlZuM5tgLgC3c+Ij4BW0CZqEuKnBwm2VA5thYzSsWPQW3RZ/bSqbpZ7H1TB8Qe
5uCT7VfLkr7XogXae4IG93Os4cwR9lDVjjAon3MRrRTjbZL9k0/rbvl/UETcuN9C
imwZeiAmRLcP6dkw9PqrjaHa/7Q5IPfc7cD+xBIcjiGwUXnHWnJek9w2itGdnVE7
0OObD2bnGvrmTrFiYnNElXpU9vxdIibL2CG69WJBWUcNv+yYhpZO21FZKVKgVLdr
+alkvXCsLgmUU5QvkKYy+BOPuHFdpQ==
=yPoG
-----END PGP SIGNATURE-----

--E2t63QxdjNRo5mou--