From: Chenyuan Yang <chenyuan0y@gmail.com>
To: mazziesaccount@gmail.com, jic23@kernel.org, lars@metafoo.de,
linux-iio@vger.kernel.org
Subject: [PATCH] iio: Fix the sorting functionality in iio_gts_build_avail_time_table
Date: Wed, 13 Mar 2024 10:57:35 -0500 [thread overview]
Message-ID: <ZfHM73ZqgnCp6CZv@cy-server> (raw)
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: 38416c28e16890b52fdd5eb73479299ec3f062f3 ("iio: light: Add gain-time-scale helpers")
Signed-off-by: Chenyuan Yang <chenyuan0y@gmail.com>
---
diff --git a/drivers/iio/industrialio-gts-helper.c b/drivers/iio/industrialio-gts-helper.c
index 7653261d2dc2..61714a8d5717 100644
--- a/drivers/iio/industrialio-gts-helper.c
+++ b/drivers/iio/industrialio-gts-helper.c
@@ -375,7 +375,7 @@ static int iio_gts_build_avail_time_table(struct iio_gts *gts)
for (i = gts->num_itime - 1; i >= 0; i--) {
int new = gts->itime_table[i].time_us;
- if (times[idx] < new) {
+ if (idx == 0 || times[idx - 1] < new) {
times[idx++] = new;
continue;
}
@@ -385,9 +385,10 @@ static int iio_gts_build_avail_time_table(struct iio_gts *gts)
memmove(×[j + 1], ×[j],
(idx - j) * sizeof(int));
times[j] = new;
- idx++;
+ break;
}
}
+ idx++;
}
/* create a list of times formatted as list of IIO_VAL_INT_PLUS_MICRO */
next reply other threads:[~2024-03-13 15:57 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-13 15:57 Chenyuan Yang [this message]
2024-03-14 15:36 ` [PATCH] iio: Fix the sorting functionality in iio_gts_build_avail_time_table Jonathan Cameron
2024-03-14 17:05 ` Matti Vaittinen
2024-03-15 7:55 ` Matti Vaittinen
2024-03-15 20:49 ` Chenyuan Yang
2024-03-16 13:40 ` Jonathan Cameron
2024-03-20 7:02 ` Matti Vaittinen
2024-03-23 18:13 ` Jonathan Cameron
2024-04-11 12:19 ` Matti Vaittinen
2024-04-26 5:52 ` Matti Vaittinen
2024-04-28 16:57 ` Jonathan Cameron
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=ZfHM73ZqgnCp6CZv@cy-server \
--to=chenyuan0y@gmail.com \
--cc=jic23@kernel.org \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=mazziesaccount@gmail.com \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).