From: Jonathan Cameron <jic23@kernel.org>
To: Tomasz Duszynski <tomasz.duszynski@octakon.com>
Cc: <linux-iio@vger.kernel.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Jonathan Cameron <Jonathan.Cameron@huawei.com>,
Lars-Peter Clausen <lars@metafoo.de>
Subject: Re: [PATCH 21/32] iio:pressure:ms5611 Fix buffer element alignment
Date: Sun, 5 Jul 2020 12:54:59 +0100 [thread overview]
Message-ID: <20200705125459.32fb5457@archlinux> (raw)
In-Reply-To: <20200607180313.GA95841@arch>
On Sun, 7 Jun 2020 20:03:13 +0200
Tomasz Duszynski <tomasz.duszynski@octakon.com> wrote:
> On Sun, Jun 07, 2020 at 04:53:57PM +0100, Jonathan Cameron 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.
> > Here there is no data leak possibility so use an explicit structure
> > on the stack to ensure alignment and nice readable fashion.
> >
> > The forced alignment of ts isn't strictly necessary in this driver
> > as the padding will be correct anyway (there isn't any). However
> > it is probably less fragile to have it there and it acts as
> > documentation of the requirement.
> >
>
> Looks good.
> Acked-by: Tomasz Duszynski <tomasz.duszynski@octakon.com>
Applied to the fixes-togreg branch of iio.git and marked for stable.
I'm picking up those patch in the series for which I have an ack to
cut down on the number we need to consider in the next version.
Thanks,
Jonathan
>
> > 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 --git a/drivers/iio/pressure/ms5611_core.c b/drivers/iio/pressure/ms5611_core.c
> > index d451bb9dffc8..214b0d25f598 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 __aligned(8);
> > + } 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:
> > --
> > 2.26.2
> >
next prev parent reply other threads:[~2020-07-05 11:55 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 [this message]
2020-06-07 15:53 ` [PATCH 22/32] iio:pressure:mpl3115 Force alignment of buffer Jonathan Cameron
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=20200705125459.32fb5457@archlinux \
--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=tomasz.duszynski@octakon.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;
as well as URLs for NNTP newsgroup(s).