projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cd4a799
)
iio: proximity: as3935: fix buffer stack trashing
author
Matt Ranostay
<mranostay@gmail.com>
Sun, 22 May 2016 03:01:03 +0000
(20:01 -0700)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 27 Jul 2016 16:47:36 +0000
(09:47 -0700)
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>
drivers/iio/proximity/as3935.c
patch
|
blob
|
history
diff --git
a/drivers/iio/proximity/as3935.c
b/drivers/iio/proximity/as3935.c
index 6aed02437efc7aeca2fbf1a943d5f2736028d15b..e2f926cdcad2acdbdd8aec50f0f479f52d2a6584 100644
(file)
--- 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);