Commit c1a8303f authored by Matt Ranostay's avatar Matt Ranostay Committed by Sasha Levin

iio: proximity: as3935: fix buffer stack trashing

[ Upstream commit 37b1ba2c ]

Buffer wasn't of a valid size to allow the timestamp, and correct padding.
This patchset also moves the buffer off the stack, and onto the heap.

Cc: george.mccollister@gmail.com
Signed-off-by: default avatarMatt Ranostay <mranostay@gmail.com>
Cc: <Stable@vger.kernel.org>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
parent 9db892c0
...@@ -64,6 +64,7 @@ struct as3935_state { ...@@ -64,6 +64,7 @@ struct as3935_state {
struct delayed_work work; struct delayed_work work;
u32 tune_cap; u32 tune_cap;
u8 buffer[16]; /* 8-bit data + 56-bit padding + 64-bit timestamp */
u8 buf[2] ____cacheline_aligned; u8 buf[2] ____cacheline_aligned;
}; };
...@@ -212,9 +213,10 @@ static irqreturn_t as3935_trigger_handler(int irq, void *private) ...@@ -212,9 +213,10 @@ static irqreturn_t as3935_trigger_handler(int irq, void *private)
ret = as3935_read(st, AS3935_DATA, &val); ret = as3935_read(st, AS3935_DATA, &val);
if (ret) if (ret)
goto err_read; goto err_read;
val &= AS3935_DATA_MASK;
iio_push_to_buffers_with_timestamp(indio_dev, &val, pf->timestamp); st->buffer[0] = val & AS3935_DATA_MASK;
iio_push_to_buffers_with_timestamp(indio_dev, &st->buffer,
pf->timestamp);
err_read: err_read:
iio_trigger_notify_done(indio_dev->trig); iio_trigger_notify_done(indio_dev->trig);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment