All of lore.kernel.org
 help / color / mirror / Atom feed
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>,
	Peter Meerwald <pmeerw@pmeerw.net>
Subject: [PATCH 15/25] iio:pressure:mpl3115 Force alignment of buffer
Date: Mon, 25 May 2020 18:06:18 +0100	[thread overview]
Message-ID: <20200525170628.503283-16-jic23@kernel.org> (raw)
In-Reply-To: <20200525170628.503283-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>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Peter Meerwald <pmeerw@pmeerw.net>
---
 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 d066f3c5a8a6..1eb761befcbe 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-05-25 17:09 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-25 17:06 [PATCH 00/25] IIO: 2nd set of timestamp alignment fixes Jonathan Cameron
2020-05-25 17:06 ` [PATCH 01/25] iio:light:si1145: Fix timestamp alignment and prevent data leak Jonathan Cameron
2020-05-25 17:06 ` [PATCH 02/25] iio:light:max44000 " Jonathan Cameron
2020-05-25 17:06 ` [PATCH 03/25] iio:light:rpr0521 " Jonathan Cameron
2020-05-25 17:06 ` [PATCH 04/25] iio:light:st_uvis25 " Jonathan Cameron
2020-05-26  7:55   ` Lorenzo Bianconi
2020-05-26 16:53     ` Jonathan Cameron
2020-06-07 14:37       ` Jonathan Cameron
2020-05-25 17:06 ` [PATCH 05/25] iio:light:ltr501 Fix timestamp alignment issue Jonathan Cameron
2020-05-25 17:06 ` [PATCH 06/25] iio:magnetometer:ak8974: Fix alignment and data leak issues Jonathan Cameron
2020-05-26  9:24   ` Linus Walleij
2020-06-07 14:43     ` Jonathan Cameron
2020-05-25 17:06 ` [PATCH 07/25] iio:magnetometer:ak8975 " Jonathan Cameron
2020-05-26  9:24   ` Andy Shevchenko
2020-05-26 16:50     ` Jonathan Cameron
2020-05-25 17:06 ` [PATCH 08/25] iio:magnetometer:mag3110 " Jonathan Cameron
2020-05-25 17:06 ` [PATCH 09/25] iio:humidity:hdc100x " Jonathan Cameron
2020-05-26 19:31   ` Matt Ranostay
2020-06-07 14:51     ` Jonathan Cameron
2020-05-25 17:06 ` [PATCH 10/25] iio:humidity:hts221 " Jonathan Cameron
2020-05-26  7:52   ` Lorenzo Bianconi
2020-06-07 14:55     ` Jonathan Cameron
2020-05-25 17:06 ` [PATCH 11/25] iio:imu:bmi160 " Jonathan Cameron
2020-05-25 17:06 ` [PATCH 12/25] iio:imu:st_lsm6dsx " Jonathan Cameron
2020-05-26  7:58   ` Lorenzo Bianconi
2020-06-07 15:07     ` Jonathan Cameron
2020-05-25 17:06 ` [PATCH 13/25] iio:imu:inv_mpu6050 Fix dma and ts " Jonathan Cameron
2020-05-25 18:44   ` Jean-Baptiste Maneyrol
2020-05-26 16:59     ` Jonathan Cameron
2020-05-25 17:06 ` [PATCH 14/25] iio:pressure:ms5611 Fix buffer element alignment Jonathan Cameron
2020-05-25 17:06 ` Jonathan Cameron [this message]
2020-05-25 17:06 ` [PATCH 16/25] iio:adc:ti-adc081c Fix alignment and data leak issues Jonathan Cameron
2020-05-25 17:06 ` [PATCH 17/25] iio:adc:ti-adc084s021 " Jonathan Cameron
2020-05-25 17:06 ` [PATCH 18/25] iio:adc:ti-adc084s021 Tidy up endian types Jonathan Cameron
2020-05-25 17:06 ` [PATCH 19/25] iio:adc:ti-ads1015 Fix buffer element alignment Jonathan Cameron
2020-05-25 17:52   ` Andy Shevchenko
2020-05-26  8:11     ` Lars-Peter Clausen
2020-05-26  9:15       ` Andy Shevchenko
2020-05-26 16:43         ` Jonathan Cameron
2020-05-26 17:06           ` Andy Shevchenko
2020-05-26 19:17             ` Jonathan Cameron
2020-05-26 21:03               ` Andy Shevchenko
2020-05-27 11:41                 ` Jonathan Cameron
2020-05-27 12:37                   ` Andy Shevchenko
2020-05-27 14:06                     ` Andy Shevchenko
2020-05-27 14:43                     ` Jonathan Cameron
2020-05-25 17:06 ` [PATCH 20/25] iio:adc:ti-ads124s08 Fix alignment and data leak issues Jonathan Cameron
2020-05-25 17:06 ` [PATCH 21/25] iio:adc:ti-ads8688 Fix alignment and potential data leak issue Jonathan Cameron
2020-05-25 17:06 ` [PATCH 22/25] iio:adc:ti-adc0832 Fix alignment issue with timestamp Jonathan Cameron
2020-05-25 17:06 ` [PATCH 23/25] iio:adc:ti-adc12138 " Jonathan Cameron
2020-05-25 17:06 ` [PATCH 24/25] iio:adc:ina2xx Fix timestamp alignment issue Jonathan Cameron
2020-05-25 17:06 ` [PATCH 25/25] iio:adc:max1118 Fix alignment of timestamp and data leak issues Jonathan Cameron
2020-05-26 17:02 ` [PATCH 00/25] IIO: 2nd set of timestamp alignment fixes 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=20200525170628.503283-16-jic23@kernel.org \
    --to=jic23@kernel.org \
    --cc=Jonathan.Cameron@huawei.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.