diff options
author | Matt Ranostay <mranostay@gmail.com> | 2016-05-21 23:01:03 -0400 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2016-05-22 15:54:15 -0400 |
commit | 37b1ba2c68cfbe37f5f45bb91bcfaf2b016ae6a1 (patch) | |
tree | 38017439414d9c72198018ec415eeba132dd5d96 | |
parent | 7d0643634ea567969bf3f3ed6193a9d6fc75653b (diff) |
iio: proximity: as3935: fix buffer stack trashing
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: Matt Ranostay <mranostay@gmail.com>
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
-rw-r--r-- | drivers/iio/proximity/as3935.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/iio/proximity/as3935.c b/drivers/iio/proximity/as3935.c index 6aed02437efc..e2f926cdcad2 100644 --- a/drivers/iio/proximity/as3935.c +++ b/drivers/iio/proximity/as3935.c | |||
@@ -64,6 +64,7 @@ struct as3935_state { | |||
64 | struct delayed_work work; | 64 | struct delayed_work work; |
65 | 65 | ||
66 | u32 tune_cap; | 66 | u32 tune_cap; |
67 | u8 buffer[16]; /* 8-bit data + 56-bit padding + 64-bit timestamp */ | ||
67 | u8 buf[2] ____cacheline_aligned; | 68 | u8 buf[2] ____cacheline_aligned; |
68 | }; | 69 | }; |
69 | 70 | ||
@@ -212,9 +213,10 @@ static irqreturn_t as3935_trigger_handler(int irq, void *private) | |||
212 | ret = as3935_read(st, AS3935_DATA, &val); | 213 | ret = as3935_read(st, AS3935_DATA, &val); |
213 | if (ret) | 214 | if (ret) |
214 | goto err_read; | 215 | goto err_read; |
215 | val &= AS3935_DATA_MASK; | ||
216 | 216 | ||
217 | iio_push_to_buffers_with_timestamp(indio_dev, &val, pf->timestamp); | 217 | st->buffer[0] = val & AS3935_DATA_MASK; |
218 | iio_push_to_buffers_with_timestamp(indio_dev, &st->buffer, | ||
219 | pf->timestamp); | ||
218 | err_read: | 220 | err_read: |
219 | iio_trigger_notify_done(indio_dev->trig); | 221 | iio_trigger_notify_done(indio_dev->trig); |
220 | 222 | ||