linux-iio.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Cameron <jic23@kernel.org>
To: linux-iio@vger.kernel.org
Cc: "Andy Shevchenko" <andy.shevchenko@gmail.com>,
	"Lars-Peter Clausen" <lars@metafoo.de>,
	"Peter Meerwald" <pmeerw@pmeerw.net>,
	"Jonathan Cameron" <Jonathan.Cameron@huawei.com>,
	"Mårten Lindahl" <martenli@axis.com>
Subject: [PATCH v3 21/27] iio:adc:ti-adc084s021 Fix alignment and data leak issues.
Date: Wed, 22 Jul 2020 16:50:57 +0100	[thread overview]
Message-ID: <20200722155103.979802-22-jic23@kernel.org> (raw)
In-Reply-To: <20200722155103.979802-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().

This data is allocated with kzalloc so no data can leak apart from
previous readings.

The force alignment of ts is not strictly necessary in this case
but reduces the fragility of the code.

Fixes: 3691e5a69449 ("iio: adc: add driver for the ti-adc084s021 chip")
Reported-by: Lars-Peter Clausen <lars@metafoo.de>
Cc: Mårten Lindahl <martenli@axis.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
---
 drivers/iio/adc/ti-adc084s021.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/iio/adc/ti-adc084s021.c b/drivers/iio/adc/ti-adc084s021.c
index 9017e1e24273..dfba34834a57 100644
--- a/drivers/iio/adc/ti-adc084s021.c
+++ b/drivers/iio/adc/ti-adc084s021.c
@@ -26,6 +26,11 @@ struct adc084s021 {
 	struct spi_transfer spi_trans;
 	struct regulator *reg;
 	struct mutex lock;
+	/* Buffer used to align data */
+	struct {
+		__be16 channels[4];
+		s64 ts __aligned(8);
+	} scan;
 	/*
 	 * DMA (thus cache coherency maintenance) requires the
 	 * transfer buffers to live in their own cache line.
@@ -141,14 +146,13 @@ static irqreturn_t adc084s021_buffer_trigger_handler(int irq, void *pollfunc)
 	struct iio_poll_func *pf = pollfunc;
 	struct iio_dev *indio_dev = pf->indio_dev;
 	struct adc084s021 *adc = iio_priv(indio_dev);
-	__be16 data[8] = {0}; /* 4 * 16-bit words of data + 8 bytes timestamp */
 
 	mutex_lock(&adc->lock);
 
-	if (adc084s021_adc_conversion(adc, &data) < 0)
+	if (adc084s021_adc_conversion(adc, adc->scan.channels) < 0)
 		dev_err(&adc->spi->dev, "Failed to read data\n");
 
-	iio_push_to_buffers_with_timestamp(indio_dev, data,
+	iio_push_to_buffers_with_timestamp(indio_dev, &adc->scan,
 					   iio_get_time_ns(indio_dev));
 	mutex_unlock(&adc->lock);
 	iio_trigger_notify_done(indio_dev->trig);
-- 
2.27.0


  parent reply	other threads:[~2020-07-22 15:53 UTC|newest]

Thread overview: 72+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-22 15:50 [PATCH v3 00/27] IIO: Fused set 1 and 2 of timestamp alignment fixes Jonathan Cameron
2020-07-22 15:50 ` [PATCH v3 01/27] iio: accel: kxsd9: Fix alignment of local buffer Jonathan Cameron
2020-08-09 17:07   ` Jonathan Cameron
2020-07-22 15:50 ` [PATCH v3 02/27] iio:accel:mma8452: Fix timestamp alignment and prevent data leak Jonathan Cameron
2020-08-09 17:14   ` Jonathan Cameron
2020-07-22 15:50 ` [PATCH v3 03/27] iio:accel:bmc150-accel: " Jonathan Cameron
2020-07-29 17:12   ` Srinivas Pandruvada
2020-08-09 17:18     ` Jonathan Cameron
2020-07-22 15:50 ` [PATCH v3 04/27] iio:accel:mma7455: " Jonathan Cameron
2020-08-09 17:19   ` Jonathan Cameron
2020-07-22 15:50 ` [PATCH v3 05/27] iio:gyro:itg3200: " Jonathan Cameron
2020-09-19 15:41   ` Jonathan Cameron
2020-07-22 15:50 ` [PATCH v3 06/27] iio:proximity:mb1232: " Jonathan Cameron
2020-08-09 17:20   ` Jonathan Cameron
2020-07-22 15:50 ` [PATCH v3 07/27] iio:chemical:ccs811: " Jonathan Cameron
2020-08-09 17:23   ` Jonathan Cameron
2020-07-22 15:50 ` [PATCH v3 08/27] iio:light:si1145: " Jonathan Cameron
2020-07-22 19:43   ` Andy Shevchenko
2020-07-22 19:45     ` Andy Shevchenko
2020-07-23 11:25       ` Jonathan Cameron
2020-09-19 15:46         ` Jonathan Cameron
2020-07-22 15:50 ` [PATCH v3 09/27] iio:light:max44000 " Jonathan Cameron
2020-08-09 17:24   ` Jonathan Cameron
2020-07-22 15:50 ` [PATCH v3 10/27] iio:light:rpr0521 " Jonathan Cameron
2020-07-22 19:47   ` Andy Shevchenko
2020-07-23 11:29     ` Jonathan Cameron
2020-09-19 16:31       ` Jonathan Cameron
2020-07-22 15:50 ` [PATCH v3 11/27] iio:light:st_uvis25 " Jonathan Cameron
2020-07-22 19:48   ` Andy Shevchenko
2020-07-22 15:50 ` [PATCH v3 12/27] iio:light:ltr501 Fix timestamp alignment issue Jonathan Cameron
2020-08-09 17:27   ` Jonathan Cameron
2020-07-22 15:50 ` [PATCH v3 13/27] iio:magnetometer:ak8975 Fix alignment and data leak issues Jonathan Cameron
2020-08-09 17:30   ` Jonathan Cameron
2020-07-22 15:50 ` [PATCH v3 14/27] iio:magnetometer:mag3110 " Jonathan Cameron
2020-07-23 12:13   ` Andy Shevchenko
2020-07-22 15:50 ` [PATCH v3 15/27] iio:imu:bmi160 " Jonathan Cameron
2020-09-19 15:58   ` Jonathan Cameron
2020-07-22 15:50 ` [PATCH v3 16/27] iio:imu:st_lsm6dsx " Jonathan Cameron
2020-09-19 16:09   ` Jonathan Cameron
2020-07-22 15:50 ` [PATCH v3 17/27] iio:imu:inv_mpu6050 Fix dma and ts " Jonathan Cameron
2020-07-24  8:27   ` Jean-Baptiste Maneyrol
2020-09-19 16:51     ` Jonathan Cameron
2020-07-22 15:50 ` [PATCH v3 18/27] iio:imu:inv_mpu6050: Use regmap_noinc_read for fifo reads Jonathan Cameron
2020-07-23 12:15   ` Andy Shevchenko
2020-07-23 12:28     ` Jonathan Cameron
2020-07-24  8:29   ` Jean-Baptiste Maneyrol
2020-09-19 16:55     ` Jonathan Cameron
2020-07-22 15:50 ` [PATCH v3 19/27] iio:pressure:mpl3115 Force alignment of buffer Jonathan Cameron
2020-07-23 12:17   ` Andy Shevchenko
2020-07-23 12:31     ` Jonathan Cameron
2020-09-19 17:02       ` Jonathan Cameron
2020-07-22 15:50 ` [PATCH v3 20/27] iio:adc:ti-adc081c Fix alignment and data leak issues Jonathan Cameron
2020-08-09 17:34   ` Jonathan Cameron
2020-07-22 15:50 ` Jonathan Cameron [this message]
2020-08-09 17:36   ` [PATCH v3 21/27] iio:adc:ti-adc084s021 " Jonathan Cameron
2020-07-22 15:50 ` [PATCH v3 22/27] iio:adc:ti-adc084s021 Tidy up endian types Jonathan Cameron
2020-08-09 17:47   ` Jonathan Cameron
2020-09-13 12:01     ` Jonathan Cameron
2020-09-13 12:06       ` Jonathan Cameron
2020-11-29 13:28         ` Jonathan Cameron
2020-07-22 15:50 ` [PATCH v3 23/27] iio:adc:ti-ads124s08 Fix alignment and data leak issues Jonathan Cameron
2020-07-22 20:54   ` Andy Shevchenko
2020-07-23 11:23     ` Jonathan Cameron
2020-07-22 15:51 ` [PATCH v3 24/27] iio:adc:ti-adc0832 Fix alignment issue with timestamp Jonathan Cameron
2020-09-19 16:18   ` Jonathan Cameron
2020-07-22 15:51 ` [PATCH v3 25/27] iio:adc:ti-adc12138 " Jonathan Cameron
2020-09-19 16:21   ` Jonathan Cameron
2020-07-22 15:51 ` [PATCH v3 26/27] iio:adc:ina2xx Fix timestamp alignment issue Jonathan Cameron
2020-08-09 17:38   ` Jonathan Cameron
2020-07-22 15:51 ` [PATCH v3 27/27] iio:adc:max1118 Fix alignment of timestamp and data leak issues Jonathan Cameron
2020-08-09 17:39   ` Jonathan Cameron
2020-07-23 12:23 ` [PATCH v3 00/27] IIO: Fused set 1 and 2 of timestamp alignment fixes Andy Shevchenko

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=20200722155103.979802-22-jic23@kernel.org \
    --to=jic23@kernel.org \
    --cc=Jonathan.Cameron@huawei.com \
    --cc=andy.shevchenko@gmail.com \
    --cc=lars@metafoo.de \
    --cc=linux-iio@vger.kernel.org \
    --cc=martenli@axis.com \
    --cc=pmeerw@pmeerw.net \
    /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).