lkml.org 
[lkml]   [2016]   [Feb]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 110/142] iio: adis_buffer: Fix out-of-bounds memory access
    Date
    From: Lars-Peter Clausen <lars@metafoo.de>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit d590faf9e8f8509a0a0aa79c38e87fcc6b913248 upstream.

    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>
    Signed-off-by: Jonathan Cameron <jic23@kernel.org>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/iio/imu/adis_buffer.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/iio/imu/adis_buffer.c b/drivers/iio/imu/adis_buffer.c
    index 99d8e0b0dd34..d0538bcdc1b8 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);

    --
    2.7.1
    \
     
     \ /
      Last update: 2016-02-24 12:21    [W:4.094 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site