Commit 5acc3f97 authored by Chenyuan Yang's avatar Chenyuan Yang Committed by Jonathan Cameron

iio: Fix the sorting functionality in iio_gts_build_avail_time_table

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: default avatarChenyuan Yang <chenyuan0y@gmail.com>
Suggested-by: default avatarMatti Vaittinen <mazziesaccount@gmail.com>
Fixes: 38416c28 ("iio: light: Add gain-time-scale helpers")
Signed-off-by: default avatarChenyuan Yang <chenyuan0y@gmail.com>
Co-developed-by: default avatarMatti Vaittinen <mazziesaccount@gmail.com>
Signed-off-by: default avatarMatti Vaittinen <mazziesaccount@gmail.com>
Link: https://lore.kernel.org/r/d501ade8c1f7b202d34c6404eda423489cab1df5.1714480171.git.mazziesaccount@gmail.comSigned-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent e5073e9c
...@@ -362,17 +362,20 @@ static int iio_gts_build_avail_time_table(struct iio_gts *gts) ...@@ -362,17 +362,20 @@ static int iio_gts_build_avail_time_table(struct iio_gts *gts)
for (i = gts->num_itime - 1; i >= 0; i--) { for (i = gts->num_itime - 1; i >= 0; i--) {
int new = gts->itime_table[i].time_us; int new = gts->itime_table[i].time_us;
if (times[idx] < new) { if (idx == 0 || times[idx - 1] < new) {
times[idx++] = new; times[idx++] = new;
continue; continue;
} }
for (j = 0; j <= idx; j++) { for (j = 0; j < idx; j++) {
if (times[j] == new)
break;
if (times[j] > new) { if (times[j] > new) {
memmove(&times[j + 1], &times[j], memmove(&times[j + 1], &times[j],
(idx - j) * sizeof(int)); (idx - j) * sizeof(int));
times[j] = new; times[j] = new;
idx++; idx++;
break;
} }
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment