diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-12-26 20:07:06 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-12-26 20:07:06 -0500 |
| commit | f744c423cacf8f9666d0390e5068813afff756e5 (patch) | |
| tree | 20f5a983bbadd22346cfdab88e395c37c97dbf36 | |
| parent | 9f9499ae8e6415cefc4fe0a96ad0e27864353c89 (diff) | |
| parent | d590faf9e8f8509a0a0aa79c38e87fcc6b913248 (diff) | |
Merge tag 'iio-fixes-for-4.4c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus
Jonathan writes:
3rd set of IIO fixes for the 4.4 cycle.
Only a single fix this time and for a bug that's been in the kernel
since around about the start of 2013 (so no rush!)
* Out-of-bounds memory access in adis core (Analog Devices IMUs)
| -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, | |||
| 43 | return -ENOMEM; | 43 | return -ENOMEM; |
| 44 | 44 | ||
| 45 | rx = adis->buffer; | 45 | rx = adis->buffer; |
| 46 | tx = rx + indio_dev->scan_bytes; | 46 | tx = rx + scan_count; |
| 47 | 47 | ||
| 48 | spi_message_init(&adis->msg); | 48 | spi_message_init(&adis->msg); |
| 49 | 49 | ||