Commit a5bf6fdd authored by Jonathan Cameron's avatar Jonathan Cameron
Browse files

iio:chemical:sps30: Fix timestamp alignment 



One of a class of bugs pointed out by Lars in a recent review.
iio_push_to_buffers_with_timestamp assumes the buffer used is aligned
to the size of the timestamp (8 bytes).  This is not guaranteed in
this driver which uses an array of smaller elements on the stack.

Fixes: 232e0f6d ("iio: chemical: add support for Sensirion SPS30 sensor")
Reported-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: <Stable@vger.kernel.org>
Acked-by: default avatarTomasz Duszynski <tomasz.duszynski@octakon.com>
parent 10134ec3

drivers/iio/chemical/sps30.c

+6 −3
Original line number Diff line number Diff line
@@ -230,15 +230,18 @@ static irqreturn_t sps30_trigger_handler(int irq, void *p) 
	struct iio_dev *indio_dev = pf->indio_dev;

	struct sps30_state *state = iio_priv(indio_dev);

	int ret;

	s32 data[4 + 2]; /* PM1, PM2P5, PM4, PM10, timestamp */

	struct {

		s32 data[4]; /* PM1, PM2P5, PM4, PM10 */

		s64 ts;

	} scan;



	mutex_lock(&state->lock);

	ret = sps30_do_meas(state, data, 4);

	ret = sps30_do_meas(state, scan.data, ARRAY_SIZE(scan.data));

	mutex_unlock(&state->lock);

	if (ret)

		goto err;



	iio_push_to_buffers_with_timestamp(indio_dev, data,

	iio_push_to_buffers_with_timestamp(indio_dev, &scan,

					   iio_get_time_ns(indio_dev));

err:

	iio_trigger_notify_done(indio_dev->trig);