diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2015-11-27 14:55:56 +0100 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2015-12-05 17:32:04 +0000 |
commit | d590faf9e8f8509a0a0aa79c38e87fcc6b913248 (patch) | |
tree | df934098d2d534d121b2afb1f64ec9cf994a65b2 /drivers/iio/imu/adis_buffer.c | |
parent | 9225c0b7b976dd9ceac2b80727a60d8fcb906a62 (diff) | |
download | linux-d590faf9e8f8509a0a0aa79c38e87fcc6b913248.tar.gz |
iio: adis_buffer: Fix out-of-bounds memory access
The SPI tx and rx buffers are both supposed to be scan_bytes amount of bytes large and a common allocation is used to allocate both buffers. This puts the beginning of the tx buffer scan_bytes bytes after the rx buffer. The initialization of the tx buffer pointer is done adding scan_bytes to the beginning of the rx buffer, but since the rx buffer is of type __be16 this will actually add two times as much and the tx buffer ends up pointing after the allocated buffer. Fix this by using scan_count, which is scan_bytes / 2, instead of scan_bytes when initializing the tx buffer pointer. Fixes: aacff892cbd5 ("staging:iio:adis: Preallocate transfer message") Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Cc: <Stable@vger.kernel.org> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio/imu/adis_buffer.c')
-rw-r--r-- | drivers/iio/imu/adis_buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/imu/adis_buffer.c b/drivers/iio/imu/adis_buffer.c index cb32b593f1c5..36607d52fee0 100644 --- a/drivers/iio/imu/adis_buffer.c +++ b/drivers/iio/imu/adis_buffer.c @@ -43,7 +43,7 @@ int adis_update_scan_mode(struct iio_dev *indio_dev, return -ENOMEM; rx = adis->buffer; - tx = rx + indio_dev->scan_bytes; + tx = rx + scan_count; spi_message_init(&adis->msg); |