From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Jonathan Cameron <jic23@kernel.org>
Cc: linux-iio@vger.kernel.org,
Jonathan Cameron <Jonathan.Cameron@huawei.com>,
Lars-Peter Clausen <lars@metafoo.de>
Subject: Re: [PATCH 19/25] iio:adc:ti-ads1015 Fix buffer element alignment
Date: Mon, 25 May 2020 20:52:36 +0300 [thread overview]
Message-ID: <20200525175236.GG1634618@smile.fi.intel.com> (raw)
In-Reply-To: <20200525170628.503283-20-jic23@kernel.org>
On Mon, May 25, 2020 at 06:06:22PM +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 we use an explicit structure and rely on that to enforce
> alignment on the stack. Note there was never a data leak here
> due to the explicit memset.
>
> Fixes: ecc24e72f437 ("iio: adc: Add TI ADS1015 ADC driver support")
> Reported-by: Lars-Peter Clausen <lars@metafoo.de>
> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
> drivers/iio/adc/ti-ads1015.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/iio/adc/ti-ads1015.c b/drivers/iio/adc/ti-ads1015.c
> index 5ea4f45d6bad..05853723dbdb 100644
> --- a/drivers/iio/adc/ti-ads1015.c
> +++ b/drivers/iio/adc/ti-ads1015.c
> @@ -385,10 +385,14 @@ static irqreturn_t ads1015_trigger_handler(int irq, void *p)
> struct iio_poll_func *pf = p;
> struct iio_dev *indio_dev = pf->indio_dev;
> struct ads1015_data *data = iio_priv(indio_dev);
> - s16 buf[8]; /* 1x s16 ADC val + 3x s16 padding + 4x s16 timestamp */
> + /* Ensure natural alignment for buffer elements */
> + struct {
> + s16 channel;
> + s64 ts;
> + } scan;
Hmm... On x86_32 and x86_64 this will give different padding. Is it okay from
iio_push_to_buffers_with_timestamp() point of view?
> int chan, ret, res;
>
> - memset(buf, 0, sizeof(buf));
> + memset(&scan, 0, sizeof(scan));
>
> mutex_lock(&data->lock);
> chan = find_first_bit(indio_dev->active_scan_mask,
> @@ -399,10 +403,10 @@ static irqreturn_t ads1015_trigger_handler(int irq, void *p)
> goto err;
> }
>
> - buf[0] = res;
> + scan.channel = res;
> mutex_unlock(&data->lock);
>
> - 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
>
--
With Best Regards,
Andy Shevchenko
next prev parent reply other threads:[~2020-05-25 17:52 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 ` [PATCH 15/25] iio:pressure:mpl3115 Force alignment of buffer Jonathan Cameron
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 [this message]
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=20200525175236.GG1634618@smile.fi.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=Jonathan.Cameron@huawei.com \
--cc=jic23@kernel.org \
--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).