diff options
| author | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2021-06-13 16:22:59 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-07-14 16:56:45 +0200 |
| commit | 9cf11dca57a5db964af61cac5a784985dd6a7507 (patch) | |
| tree | b4a9b77adfdde65b73ca285fae956e57ae7e4230 /drivers | |
| parent | 8c85c0f8cbff0825f38ea631d3dff34e31c6573a (diff) | |
| download | linux-9cf11dca57a5db964af61cac5a784985dd6a7507.tar.gz linux-9cf11dca57a5db964af61cac5a784985dd6a7507.tar.bz2 linux-9cf11dca57a5db964af61cac5a784985dd6a7507.zip | |
iio: light: vcnl4000: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
[ Upstream commit dce793c0ab00c35039028fdcd5ce123805a01361 ]
Add __aligned(8) to ensure the buffer passed to
iio_push_to_buffers_with_timestamp() is suitable for the naturally
aligned timestamp that will be inserted.
Here an explicit structure is not used, because the holes would
necessitate the addition of an explict memset(), to avoid a kernel
data leak, making for a less minimal fix.
Found during an audit of all callers of iio_push_to_buffers_with_timestamp()
Fixes: 8fe78d5261e7 ("iio: vcnl4000: Add buffer support for VCNL4010/20.")
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Mathieu Othacehe <m.othacehe@gmail.com>
Reviewed-by: Nuno Sá <nuno.sa@analog.com>
Link: https://lore.kernel.org/r/20210613152301.571002-7-jic23@kernel.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/iio/light/vcnl4000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c index fff4b36b8b58..f4feb44903b3 100644 --- a/drivers/iio/light/vcnl4000.c +++ b/drivers/iio/light/vcnl4000.c @@ -910,7 +910,7 @@ static irqreturn_t vcnl4010_trigger_handler(int irq, void *p) struct iio_dev *indio_dev = pf->indio_dev; struct vcnl4000_data *data = iio_priv(indio_dev); const unsigned long *active_scan_mask = indio_dev->active_scan_mask; - u16 buffer[8] = {0}; /* 1x16-bit + ts */ + u16 buffer[8] __aligned(8) = {0}; /* 1x16-bit + naturally aligned ts */ bool data_read = false; unsigned long isr; int val = 0; |