lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools: iio: iio_generic_buffer ensure alignment

Browse Source 
[ Upstream commit 2d3dff577dd0ea8fe9637a13822f7603c4a881c8 ]

The iio_generic_buffer can return garbage values when the total size of
scan data is not a multiple of the largest element in the scan. This can be
demonstrated by reading a scan, consisting, for example of one 4-byte and
one 2-byte element, where the 4-byte element is first in the buffer.

The IIO generic buffer code does not take into account the last two
padding bytes that are needed to ensure that the 4-byte data for next
scan is correctly aligned.

Add the padding bytes required to align the next sample with the scan size.

Signed-off-by: Matti Vaittinen <mazziesaccount@gmail.com>
Fixes: e58537ccce ("staging: iio: update example application.")
Link: https://lore.kernel.org/r/ZRvlm4ktNLu+qmlf@dc78bmyyyyyyyyyyyyydt-3.rev.dnainternet.fi
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Matti Vaittinen 2023-10-03 12:57:47 +03:00 committed by Greg Kroah-Hartman
parent 7a64d15db7
commit b003b7a7d4
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/iio/iio_generic_buffer.c
View File

@ -52,9 +52,12 @@ enum autochan {
static unsigned int size_from_channelarray(struct iio_channel_info *channels, int num_channels) static unsigned int size_from_channelarray(struct iio_channel_info *channels, int num_channels)
{ {
unsigned int bytes = 0; unsigned int bytes = 0;
int i = 0; int i = 0, max = 0;
unsigned int misalignment;
while (i < num_channels) { while (i < num_channels) {
if (channels[i].bytes > max)
max = channels[i].bytes;
if (bytes % channels[i].bytes == 0) if (bytes % channels[i].bytes == 0)
channels[i].location = bytes; channels[i].location = bytes;
else else
@ -64,6 +67,14 @@ static unsigned int size_from_channelarray(struct iio_channel_info *channels, in
bytes = channels[i].location + channels[i].bytes; bytes = channels[i].location + channels[i].bytes;
i++; i++;
} }
/*
* We want the data in next sample to also be properly aligned so
* we'll add padding at the end if needed. Adding padding only
* works for channel data which size is 2^n bytes.
*/
misalignment = bytes % max;
if (misalignment)
bytes += max - misalignment;
return bytes; return bytes;
} }