linux-iio.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Cameron <jic23@kernel.org>
To: linux-iio@vger.kernel.org
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
	Jonathan Cameron <Jonathan.Cameron@huawei.com>,
	Lars-Peter Clausen <lars@metafoo.de>,
	Peter Meerwald <pmeerw@pmeerw.net>
Subject: [PATCH 22/32] iio:pressure:mpl3115 Force alignment of buffer
Date: Sun,  7 Jun 2020 16:53:58 +0100	[thread overview]
Message-ID: <20200607155408.958437-23-jic23@kernel.org> (raw)
In-Reply-To: <20200607155408.958437-1-jic23@kernel.org>

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

Whilst this is another case of the issue Lars reported with
an array of elements of smaller than 8 bytes being passed
to iio_push_to_buffers_with_timestamp, the solution here is
a bit different from the other cases and relies on __aligned
working on the stack (true since 4.6?)

This one is unusual.  We have to do an explicit memset each time
as we are reading 3 bytes into a potential 4 byte channel which
may sometimes be a 2 byte channel depending on what is enabled.
As such, moving the buffer to the heap in the iio_priv structure
doesn't save us much.  We can't use a nice explicit structure
on the stack either as the data channels have different storage
sizes and are all separately controlled.

Fixes: cc26ad455f57 ("iio: Add Freescale MPL3115A2 pressure / temperature sensor driver")
Reported-by: Lars-Peter Clausen <lars@metafoo.de>
Cc: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
---
 drivers/iio/pressure/mpl3115.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/iio/pressure/mpl3115.c b/drivers/iio/pressure/mpl3115.c
index ccdb0b70e48c..8a481dbe808c 100644
--- a/drivers/iio/pressure/mpl3115.c
+++ b/drivers/iio/pressure/mpl3115.c
@@ -144,7 +144,8 @@ static irqreturn_t mpl3115_trigger_handler(int irq, void *p)
 	struct iio_poll_func *pf = p;
 	struct iio_dev *indio_dev = pf->indio_dev;
 	struct mpl3115_data *data = iio_priv(indio_dev);
-	u8 buffer[16]; /* 32-bit channel + 16-bit channel + padding + ts */
+	/* 32-bit channel + 16-bit channel + padding + ts */
+	u8 buffer[16] __aligned(8);
 	int ret, pos = 0;
 
 	mutex_lock(&data->lock);
-- 
2.26.2


  parent reply	other threads:[~2020-06-07 15:56 UTC|newest]

Thread overview: 54+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-07 15:53 [PATCH v2 00/32] IIO: Fused set 1 and 2 of timestamp alignment fixes Jonathan Cameron
2020-06-07 15:53 ` [PATCH 01/32] iio: accel: kxsd9: Fix alignment of local buffer Jonathan Cameron
2020-06-07 16:05   ` Andy Shevchenko
2020-06-07 16:34     ` Jonathan Cameron
2020-06-07 15:53 ` [PATCH 02/32] iio:accel:mma8452: Fix timestamp alignment and prevent data leak Jonathan Cameron
2020-06-07 15:53 ` [PATCH 03/32] iio:accel:bmc150-accel: " Jonathan Cameron
2020-06-07 16:08   ` Andy Shevchenko
2020-06-07 15:53 ` [PATCH 04/32] iio:accel:mma7455: " Jonathan Cameron
2020-06-07 15:53 ` [PATCH 05/32] iio:gyro:itg3200: " Jonathan Cameron
2020-06-07 15:53 ` [PATCH 06/32] iio:proximity:mb1232: " Jonathan Cameron
2020-06-07 15:53 ` [PATCH 07/32] iio:chemical:ccs811: " Jonathan Cameron
2020-06-07 15:53 ` [PATCH 08/32] iio:light:si1145: " Jonathan Cameron
2020-06-07 15:53 ` [PATCH 09/32] iio:light:max44000 " Jonathan Cameron
2020-06-07 15:53 ` [PATCH 10/32] iio:light:rpr0521 " Jonathan Cameron
2020-06-07 15:53 ` [PATCH 11/32] iio:light:st_uvis25 " Jonathan Cameron
2020-07-05 11:42   ` Jonathan Cameron
2020-07-05 12:05   ` Andy Shevchenko
2020-07-05 13:24     ` Jonathan Cameron
2020-06-07 15:53 ` [PATCH 12/32] iio:light:ltr501 Fix timestamp alignment issue Jonathan Cameron
2020-06-07 15:53 ` [PATCH 13/32] iio:magnetometer:ak8974: Fix alignment and data leak issues Jonathan Cameron
2020-07-05 11:43   ` Jonathan Cameron
2020-06-07 15:53 ` [PATCH 14/32] iio:magnetometer:ak8975 " Jonathan Cameron
2020-06-07 15:53 ` [PATCH 15/32] iio:magnetometer:mag3110 " Jonathan Cameron
2020-06-07 15:53 ` [PATCH 16/32] iio:humidity:hdc100x " Jonathan Cameron
2020-07-05 11:46   ` Jonathan Cameron
2020-06-07 15:53 ` [PATCH 17/32] iio:humidity:hts221 " Jonathan Cameron
2020-07-05 11:48   ` Jonathan Cameron
2020-06-07 15:53 ` [PATCH 18/32] iio:imu:bmi160 " Jonathan Cameron
2020-06-08 13:17   ` Andy Shevchenko
2020-06-08 14:03     ` Jonathan Cameron
2020-06-07 15:53 ` [PATCH 19/32] iio:imu:st_lsm6dsx " Jonathan Cameron
2020-06-07 22:33   ` Lorenzo Bianconi
2020-07-22 15:08     ` Jonathan Cameron
2020-07-22 16:02       ` Lorenzo Bianconi
2020-06-07 15:53 ` [PATCH 20/32] iio:imu:inv_mpu6050 Fix dma and ts " Jonathan Cameron
2020-06-08 10:24   ` Jean-Baptiste Maneyrol
2020-06-08 10:42     ` Andy Shevchenko
2020-06-07 15:53 ` [PATCH 21/32] iio:pressure:ms5611 Fix buffer element alignment Jonathan Cameron
2020-06-07 18:03   ` Tomasz Duszynski
2020-07-05 11:54     ` Jonathan Cameron
2020-06-07 15:53 ` Jonathan Cameron [this message]
2020-06-07 15:53 ` [PATCH 23/32] iio:adc:ti-adc081c Fix alignment and data leak issues Jonathan Cameron
2020-06-07 15:54 ` [PATCH 24/32] iio:adc:ti-adc084s021 " Jonathan Cameron
2020-06-07 15:54 ` [PATCH 25/32] iio:adc:ti-adc084s021 Tidy up endian types Jonathan Cameron
2020-06-07 15:54 ` [PATCH 26/32] iio:adc:ti-ads1015 Fix buffer element alignment Jonathan Cameron
2020-06-07 15:54 ` [PATCH 27/32] iio:adc:ti-ads124s08 Fix alignment and data leak issues Jonathan Cameron
2020-06-08 13:14   ` Andy Shevchenko
2020-06-08 14:06     ` Jonathan Cameron
2020-06-08 14:35       ` Andy Shevchenko
2020-06-07 15:54 ` [PATCH 28/32] iio:adc:ti-ads8688 Fix alignment and potential data leak issue Jonathan Cameron
2020-06-07 15:54 ` [PATCH 29/32] iio:adc:ti-adc0832 Fix alignment issue with timestamp Jonathan Cameron
2020-06-07 15:54 ` [PATCH 30/32] iio:adc:ti-adc12138 " Jonathan Cameron
2020-06-07 15:54 ` [PATCH 31/32] iio:adc:ina2xx Fix timestamp alignment issue Jonathan Cameron
2020-06-07 15:54 ` [PATCH 32/32] iio:adc:max1118 Fix alignment of timestamp and data leak issues Jonathan Cameron

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200607155408.958437-23-jic23@kernel.org \
    --to=jic23@kernel.org \
    --cc=Jonathan.Cameron@huawei.com \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=lars@metafoo.de \
    --cc=linux-iio@vger.kernel.org \
    --cc=pmeerw@pmeerw.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).