From: jic23@kernel.org
To: linux-iio@vger.kernel.org
Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com>,
Lars-Peter Clausen <lars@metafoo.de>
Subject: [PATCH 01/11] iio: accel: kxsd9: Fix alignment of local buffer.
Date: Sun, 17 May 2020 18:29:50 +0100 [thread overview]
Message-ID: <20200517173000.220819-2-jic23@kernel.org> (raw)
In-Reply-To: <20200517173000.220819-1-jic23@kernel.org>
From: Jonathan Cameron <Jonathan.Cameron@huawei.com>
iio_push_to_buffers_with_timestamp assumes 8 byte alignment which
is not guaranteed by an array of smaller elements.
Reported-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
---
drivers/iio/accel/kxsd9.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/drivers/iio/accel/kxsd9.c b/drivers/iio/accel/kxsd9.c
index 0b876b2dc5bd..f989e6ffda88 100644
--- a/drivers/iio/accel/kxsd9.c
+++ b/drivers/iio/accel/kxsd9.c
@@ -209,14 +209,20 @@ static irqreturn_t kxsd9_trigger_handler(int irq, void *p)
const struct iio_poll_func *pf = p;
struct iio_dev *indio_dev = pf->indio_dev;
struct kxsd9_state *st = iio_priv(indio_dev);
+ /*
+ * Ensure correct positioning and alignment of timestamp.
+ * No need to zero initialize as all elements written.
+ */
+ struct {
+ __be16 chan[4];
+ s64 ts;
+ } hw_values;
int ret;
- /* 4 * 16bit values AND timestamp */
- __be16 hw_values[8];
ret = regmap_bulk_read(st->map,
KXSD9_REG_X,
- &hw_values,
- 8);
+ hw_values.chan,
+ sizeof(hw_values.chan));
if (ret) {
dev_err(st->dev,
"error reading data\n");
@@ -224,7 +230,7 @@ static irqreturn_t kxsd9_trigger_handler(int irq, void *p)
}
iio_push_to_buffers_with_timestamp(indio_dev,
- hw_values,
+ &hw_values,
iio_get_time_ns(indio_dev));
iio_trigger_notify_done(indio_dev->trig);
--
2.26.2
next prev parent reply other threads:[~2020-05-17 17:32 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-17 17:29 [PATCH 00/11] IIO: 1st set of timestamp alignment fixes jic23
2020-05-17 17:29 ` jic23 [this message]
2020-05-17 17:29 ` [PATCH 02/11] iio:accel:mma8452: Fix timestamp alignment and prevent data leak jic23
2020-05-17 18:57 ` Lars-Peter Clausen
2020-05-18 16:37 ` Jonathan Cameron
2020-05-17 17:29 ` [PATCH 03/11] iio:accel:bmc150-accel: " jic23
2020-05-17 17:29 ` [PATCH 04/11] iio:accel:mma7455: " jic23
2020-05-17 17:29 ` [PATCH 05/11] iio:gyro:itg3200: " jic23
2020-05-17 17:29 ` [PATCH 06/11] iio:proximity:mb1232: " jic23
2020-05-17 17:29 ` [PATCH 07/11] iio:health:afe4403 " jic23
2020-05-18 0:09 ` Andrew F. Davis
2020-05-18 16:06 ` Jonathan Cameron
2020-05-21 13:11 ` Andrew F. Davis
2020-05-21 14:44 ` Jonathan Cameron
2020-05-21 18:45 ` Jonathan Cameron
2020-05-21 19:05 ` Andrew F. Davis
2020-05-24 15:33 ` Jonathan Cameron
2020-05-17 17:29 ` [PATCH 08/11] iio:health:afe4404 " jic23
2020-05-24 15:34 ` Jonathan Cameron
2020-05-17 17:29 ` [PATCH 09/11] iio:chemical:ccs811: " jic23
2020-05-17 17:29 ` [PATCH 10/11] iio:chemical:sps30: Fix timestamp alignment jic23
2020-05-17 19:07 ` Tomasz Duszynski
2020-05-21 18:43 ` Jonathan Cameron
2020-05-17 17:30 ` [PATCH 11/11] iio:chemical:pms7003: Fix timestamp alignment and prevent data leak jic23
2020-05-17 19:06 ` Tomasz Duszynski
2020-05-21 18:44 ` 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=20200517173000.220819-2-jic23@kernel.org \
--to=jic23@kernel.org \
--cc=Jonathan.Cameron@huawei.com \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
/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).