diff options
| author | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2021-06-13 16:23:00 +0100 |
|---|---|---|
| committer | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2021-06-16 14:53:08 +0100 |
| commit | ec90b52c07c0403a6db60d752484ec08d605ead0 (patch) | |
| tree | 784e62b73d5189fafc4c14c9b8ef563ddcafef01 /drivers/iio/light/vcnl4035.c | |
| parent | dce793c0ab00c35039028fdcd5ce123805a01361 (diff) | |
| download | lwn-ec90b52c07c0403a6db60d752484ec08d605ead0.tar.gz lwn-ec90b52c07c0403a6db60d752484ec08d605ead0.zip | |
iio: light: vcnl4035: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
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 potential
kernel data leak, making for a less minimal fix.
Fixes: 55707294c4eb ("iio: light: Add support for vishay vcnl4035")
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Parthiban Nallathambi <pn@denx.de>
Reviewed-by: Nuno Sá <nuno.sa@analog.com>
Link: https://lore.kernel.org/r/20210613152301.571002-8-jic23@kernel.org
Diffstat (limited to 'drivers/iio/light/vcnl4035.c')
| -rw-r--r-- | drivers/iio/light/vcnl4035.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/iio/light/vcnl4035.c b/drivers/iio/light/vcnl4035.c index fd2f181b16db..0db306ee910e 100644 --- a/drivers/iio/light/vcnl4035.c +++ b/drivers/iio/light/vcnl4035.c @@ -102,7 +102,8 @@ static irqreturn_t vcnl4035_trigger_consumer_handler(int irq, void *p) struct iio_poll_func *pf = p; struct iio_dev *indio_dev = pf->indio_dev; struct vcnl4035_data *data = iio_priv(indio_dev); - u8 buffer[ALIGN(sizeof(u16), sizeof(s64)) + sizeof(s64)]; + /* Ensure naturally aligned timestamp */ + u8 buffer[ALIGN(sizeof(u16), sizeof(s64)) + sizeof(s64)] __aligned(8); int ret; ret = regmap_read(data->regmap, VCNL4035_ALS_DATA, (int *)buffer); |