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>, Dan Murphy <dmurphy@ti.com>
Subject: [PATCH 20/25] iio:adc:ti-ads124s08 Fix alignment and data leak issues.
Date: Mon, 25 May 2020 18:06:23 +0100	[thread overview]
Message-ID: <20200525170628.503283-21-jic23@kernel.org> (raw)
In-Reply-To: <20200525170628.503283-1-jic23@kernel.org>

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.
As Lars also noted this anti pattern can involve a leak of data to
userspace and that indeed can happen here.  We close both issues by
moving to a suitable structure in the iio_priv() data with alignment
explicitly requested.  This data is allocated with kzalloc so no
data can leak apart from previous readings.

Fixes: e717f8c6dfec ("iio: adc: Add the TI ads124s08 ADC code")
Reported-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Dan Murphy <dmurphy@ti.com>
---
 drivers/iio/adc/ti-ads124s08.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/iio/adc/ti-ads124s08.c b/drivers/iio/adc/ti-ads124s08.c
index f1ee3b1e2827..fb0da62b09f5 100644
--- a/drivers/iio/adc/ti-ads124s08.c
+++ b/drivers/iio/adc/ti-ads124s08.c
@@ -99,6 +99,11 @@ struct ads124s_private {
 	struct gpio_desc *reset_gpio;
 	struct spi_device *spi;
 	struct mutex lock;
+	/*
+	 * Used to correctly align data.
+	 * Ensure timestamp is naturally aligned.
+	 */
+	u32 buffer[ADS124S08_MAX_CHANNELS + sizeof(s64)/sizeof(u16)] __aligned(8);
 	u8 data[5] ____cacheline_aligned;
 };
 
@@ -269,7 +274,6 @@ static irqreturn_t ads124s_trigger_handler(int irq, void *p)
 	struct iio_poll_func *pf = p;
 	struct iio_dev *indio_dev = pf->indio_dev;
 	struct ads124s_private *priv = iio_priv(indio_dev);
-	u32 buffer[ADS124S08_MAX_CHANNELS + sizeof(s64)/sizeof(u16)];
 	int scan_index, j = 0;
 	int ret;
 
@@ -284,7 +288,7 @@ static irqreturn_t ads124s_trigger_handler(int irq, void *p)
 		if (ret)
 			dev_err(&priv->spi->dev, "Start ADC conversions failed\n");
 
-		buffer[j] = ads124s_read(indio_dev, scan_index);
+		priv->buffer[j] = ads124s_read(indio_dev, scan_index);
 		ret = ads124s_write_cmd(indio_dev, ADS124S08_STOP_CONV);
 		if (ret)
 			dev_err(&priv->spi->dev, "Stop ADC conversions failed\n");
@@ -292,7 +296,7 @@ static irqreturn_t ads124s_trigger_handler(int irq, void *p)
 		j++;
 	}
 
-	iio_push_to_buffers_with_timestamp(indio_dev, buffer,
+	iio_push_to_buffers_with_timestamp(indio_dev, priv->buffer,
 			pf->timestamp);
 
 	iio_trigger_notify_done(indio_dev->trig);
-- 
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 ` [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
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 ` Jonathan Cameron [this message]
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-21-jic23@kernel.org \
    --to=jic23@kernel.org \
    --cc=Jonathan.Cameron@huawei.com \
    --cc=dmurphy@ti.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 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.