lkml.org 
[lkml]   [2020]   [Sep]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 087/132] iio: accel: kxsd9: Fix alignment of local buffer.
    Date
    From: Jonathan Cameron <Jonathan.Cameron@huawei.com>

    commit 95ad67577de4ea08eb8e441394e698aa4addcc0b upstream.

    iio_push_to_buffers_with_timestamp assumes 8 byte alignment which
    is not guaranteed by an array of smaller elements.

    Note that whilst in this particular case the alignment forcing
    of the ts element is not strictly necessary it acts as good
    documentation. Doing this where not necessary should cut
    down on the number of cut and paste introduced errors elsewhere.

    Fixes: 0427a106a98a ("iio: accel: kxsd9: Add triggered buffer handling")
    Reported-by: Lars-Peter Clausen <lars@metafoo.de>
    Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
    Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
    Cc: <Stable@vger.kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/iio/accel/kxsd9.c | 16 +++++++++++-----
    1 file changed, 11 insertions(+), 5 deletions(-)

    --- a/drivers/iio/accel/kxsd9.c
    +++ b/drivers/iio/accel/kxsd9.c
    @@ -209,14 +209,20 @@ static irqreturn_t kxsd9_trigger_handler
    const struct iio_poll_func *pf = p;
    struct iio_dev *indio_dev = pf->indio_dev;
    struct kxsd9_state *st = iio_priv(indio_dev);
    + /*
    + * Ensure correct positioning and alignment of timestamp.
    + * No need to zero initialize as all elements written.
    + */
    + struct {
    + __be16 chan[4];
    + s64 ts __aligned(8);
    + } hw_values;
    int ret;
    - /* 4 * 16bit values AND timestamp */
    - __be16 hw_values[8];

    ret = regmap_bulk_read(st->map,
    KXSD9_REG_X,
    - &hw_values,
    - 8);
    + hw_values.chan,
    + sizeof(hw_values.chan));
    if (ret) {
    dev_err(st->dev,
    "error reading data\n");
    @@ -224,7 +230,7 @@ static irqreturn_t kxsd9_trigger_handler
    }

    iio_push_to_buffers_with_timestamp(indio_dev,
    - hw_values,
    + &hw_values,
    iio_get_time_ns(indio_dev));
    iio_trigger_notify_done(indio_dev->trig);


    \
     
     \ /
      Last update: 2020-09-16 02:02    [W:4.034 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site