diff mbox series

[14/25] iio:pressure:ms5611 Fix buffer element alignment

Message ID	20200525170628.503283-15-jic23@kernel.org (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=I6G3=7H=vger.kernel.org=linux-iio-owner@kernel.org> From: Jonathan Cameron <jic23@kernel.org> To: linux-iio@vger.kernel.org Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com>, Lars-Peter Clausen <lars@metafoo.de> Subject: [PATCH 14/25] iio:pressure:ms5611 Fix buffer element alignment Date: Mon, 25 May 2020 18:06:17 +0100 Message-Id: <20200525170628.503283-15-jic23@kernel.org> In-Reply-To: <20200525170628.503283-1-jic23@kernel.org> References: <20200525170628.503283-1-jic23@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-iio-owner@vger.kernel.org Precedence: bulk
Series	IIO: 2nd set of timestamp alignment fixes. \| expand [00/25] IIO: 2nd set of timestamp alignment fixes. [01/25] iio:light:si1145: Fix timestamp alignment and prevent data leak. [02/25] iio:light:max44000 Fix timestamp alignment and prevent data leak. [03/25] iio:light:rpr0521 Fix timestamp alignment and prevent data leak. [04/25] iio:light:st_uvis25 Fix timestamp alignment and prevent data leak. [05/25] iio:light:ltr501 Fix timestamp alignment issue. [06/25] iio:magnetometer:ak8974: Fix alignment and data leak issues [07/25] iio:magnetometer:ak8975 Fix alignment and data leak issues. [08/25] iio:magnetometer:mag3110 Fix alignment and data leak issues. [09/25] iio:humidity:hdc100x Fix alignment and data leak issues [10/25] iio:humidity:hts221 Fix alignment and data leak issues [11/25] iio:imu:bmi160 Fix alignment and data leak issues [12/25] iio:imu:st_lsm6dsx Fix alignment and data leak issues [13/25] iio:imu:inv_mpu6050 Fix dma and ts alignment and data leak issues. [14/25] iio:pressure:ms5611 Fix buffer element alignment [15/25] iio:pressure:mpl3115 Force alignment of buffer [16/25] iio:adc:ti-adc081c Fix alignment and data leak issues [17/25] iio:adc:ti-adc084s021 Fix alignment and data leak issues. [18/25] iio:adc:ti-adc084s021 Tidy up endian types [19/25] iio:adc:ti-ads1015 Fix buffer element alignment [20/25] iio:adc:ti-ads124s08 Fix alignment and data leak issues. [21/25] iio:adc:ti-ads8688 Fix alignment and potential data leak issue [22/25] iio:adc:ti-adc0832 Fix alignment issue with timestamp [23/25] iio:adc:ti-adc12138 Fix alignment issue with timestamp [24/25] iio:adc:ina2xx Fix timestamp alignment issue. [25/25] iio:adc:max1118 Fix alignment of timestamp and data leak issues

Commit Message

Jonathan Cameron May 25, 2020, 5:06 p.m. UTC

From: Jonathan Cameron <Jonathan.Cameron@huawei.com>

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.
Here there is no data leak possibility so use an explicit structure
on the stack to ensure alignment and nice readable fashion.

Fixes: 713bbb4efb9dc ("iio: pressure: ms5611: Add triggered buffer support")
Reported-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
---
 drivers/iio/pressure/ms5611_core.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff mbox series

Patch

diff --git a/drivers/iio/pressure/ms5611_core.c b/drivers/iio/pressure/ms5611_core.c
index 2f598ad91621..ba9cf9d77a4a 100644
--- a/drivers/iio/pressure/ms5611_core.c
+++ b/drivers/iio/pressure/ms5611_core.c
@@ -212,16 +212,21 @@  static irqreturn_t ms5611_trigger_handler(int irq, void *p)
 	struct iio_poll_func *pf = p;
 	struct iio_dev *indio_dev = pf->indio_dev;
 	struct ms5611_state *st = iio_priv(indio_dev);
-	s32 buf[4]; /* s32 (pressure) + s32 (temp) + 2 * s32 (timestamp) */
+	/* Ensure buffer elements are naturally aligned */
+	struct {
+		s32 channels[2];
+		s64 ts;
+	} scan;
 	int ret;
 
 	mutex_lock(&st->lock);
-	ret = ms5611_read_temp_and_pressure(indio_dev, &buf[1], &buf[0]);
+	ret = ms5611_read_temp_and_pressure(indio_dev, &scan.channels[1],
+					    &scan.channels[0]);
 	mutex_unlock(&st->lock);
 	if (ret < 0)
 		goto err;
 
-	iio_push_to_buffers_with_timestamp(indio_dev, buf,
+	iio_push_to_buffers_with_timestamp(indio_dev, &scan,
 					   iio_get_time_ns(indio_dev));
 
 err: