From: Tomasz Duszynski <tomasz.duszynski@octakon.com>
To: <jic23@kernel.org>
Cc: <linux-iio@vger.kernel.org>,
Jonathan Cameron <Jonathan.Cameron@huawei.com>,
Lars-Peter Clausen <lars@metafoo.de>,
Tomasz Duszynski <tduszyns@gmail.com>
Subject: Re: [PATCH 10/11] iio:chemical:sps30: Fix timestamp alignment
Date: Sun, 17 May 2020 21:07:28 +0200 [thread overview]
Message-ID: <20200517190728.GB18033@arch> (raw)
In-Reply-To: <20200517173000.220819-11-jic23@kernel.org>
On Sun, May 17, 2020 at 06:29:59PM +0100, jic23@kernel.org wrote:
> 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.
>
> Fixes: 232e0f6ddeae ("iio: chemical: add support for Sensirion SPS30 sensor")
> Reported-by: Lars-Peter Clausen <lars@metafoo.de>
> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> Cc: Tomasz Duszynski <tduszyns@gmail.com>
> ---
> drivers/iio/chemical/sps30.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/iio/chemical/sps30.c b/drivers/iio/chemical/sps30.c
> index acb9f8ecbb3d..a88c1fb875a0 100644
> --- a/drivers/iio/chemical/sps30.c
> +++ b/drivers/iio/chemical/sps30.c
> @@ -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);
> --
> 2.26.2
>
Thanks for the fix.
Acked-by: Tomasz Duszynski <tomasz.duszynski@octakon.com>
next prev parent reply other threads:[~2020-05-17 19:09 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 ` [PATCH 01/11] iio: accel: kxsd9: Fix alignment of local buffer jic23
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 [this message]
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=20200517190728.GB18033@arch \
--to=tomasz.duszynski@octakon.com \
--cc=Jonathan.Cameron@huawei.com \
--cc=jic23@kernel.org \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=tduszyns@gmail.com \
/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