diff options
| author | Matt Ranostay <mranostay@gmail.com> | 2016-05-21 20:01:03 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-07-27 08:42:20 -0700 |
| commit | 4866f01a114489b78f7a2443ec363a2330bf8ab1 (patch) | |
| tree | 9fbfeaaab05c90b56b379c901cb57daf7aea5513 | |
| parent | ccef316501702055682533e53597229e3f391ee2 (diff) | |
| download | linux-stable-4866f01a114489b78f7a2443ec363a2330bf8ab1.tar.gz linux-stable-4866f01a114489b78f7a2443ec363a2330bf8ab1.tar.bz2 linux-stable-4866f01a114489b78f7a2443ec363a2330bf8ab1.zip | |
iio: proximity: as3935: fix buffer stack trashing
commit 37b1ba2c68cfbe37f5f45bb91bcfaf2b016ae6a1 upstream.
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>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.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 { struct delayed_work work; u32 tune_cap; + u8 buffer[16]; /* 8-bit data + 56-bit padding + 64-bit timestamp */ u8 buf[2] ____cacheline_aligned; }; @@ -212,9 +213,10 @@ static irqreturn_t as3935_trigger_handler(int irq, void *private) ret = as3935_read(st, AS3935_DATA, &val); if (ret) 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: iio_trigger_notify_done(indio_dev->trig); |