Commit 7e5ac1f2 authored by Jonathan Cameron's avatar Jonathan Cameron

iio:accel:mma7455: Fix timestamp alignment and prevent data leak.

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 a 16 byte u8 array 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
ensured by use of an explicit c structure.  This data is allocated
with kzalloc so no data can leak appart from previous readings.

The force alignment of ts is not strictly necessary in this particularly
case but does make the code less fragile.

Fixes: a84ef0d1 ("iio: accel: add Freescale MMA7455L/MMA7456L 3-axis accelerometer driver")
Reported-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: <Stable@vger.kernel.org>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
parent a6f86f72
...@@ -52,6 +52,14 @@ ...@@ -52,6 +52,14 @@
struct mma7455_data { struct mma7455_data {
struct regmap *regmap; struct regmap *regmap;
/*
* Used to reorganize data. Will ensure correct alignment of
* the timestamp if present
*/
struct {
__le16 channels[3];
s64 ts __aligned(8);
} scan;
}; };
static int mma7455_drdy(struct mma7455_data *mma7455) static int mma7455_drdy(struct mma7455_data *mma7455)
...@@ -82,19 +90,19 @@ static irqreturn_t mma7455_trigger_handler(int irq, void *p) ...@@ -82,19 +90,19 @@ static irqreturn_t mma7455_trigger_handler(int irq, void *p)
struct iio_poll_func *pf = p; struct iio_poll_func *pf = p;
struct iio_dev *indio_dev = pf->indio_dev; struct iio_dev *indio_dev = pf->indio_dev;
struct mma7455_data *mma7455 = iio_priv(indio_dev); struct mma7455_data *mma7455 = iio_priv(indio_dev);
u8 buf[16]; /* 3 x 16-bit channels + padding + ts */
int ret; int ret;
ret = mma7455_drdy(mma7455); ret = mma7455_drdy(mma7455);
if (ret) if (ret)
goto done; goto done;
ret = regmap_bulk_read(mma7455->regmap, MMA7455_REG_XOUTL, buf, ret = regmap_bulk_read(mma7455->regmap, MMA7455_REG_XOUTL,
sizeof(__le16) * 3); mma7455->scan.channels,
sizeof(mma7455->scan.channels));
if (ret) if (ret)
goto done; goto done;
iio_push_to_buffers_with_timestamp(indio_dev, buf, iio_push_to_buffers_with_timestamp(indio_dev, &mma7455->scan,
iio_get_time_ns(indio_dev)); iio_get_time_ns(indio_dev));
done: done:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment