Skip to content

Commit 7e5ac1f

Browse files
committed
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: a84ef0d ("iio: accel: add Freescale MMA7455L/MMA7456L 3-axis accelerometer driver") Reported-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Cc: <Stable@vger.kernel.org> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
1 parent a6f86f7 commit 7e5ac1f

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

drivers/iio/accel/mma7455_core.c

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,14 @@
5252

5353
struct mma7455_data {
5454
struct regmap *regmap;
55+
/*
56+
* Used to reorganize data. Will ensure correct alignment of
57+
* the timestamp if present
58+
*/
59+
struct {
60+
__le16 channels[3];
61+
s64 ts __aligned(8);
62+
} scan;
5563
};
5664

5765
static int mma7455_drdy(struct mma7455_data *mma7455)
@@ -82,19 +90,19 @@ static irqreturn_t mma7455_trigger_handler(int irq, void *p)
8290
struct iio_poll_func *pf = p;
8391
struct iio_dev *indio_dev = pf->indio_dev;
8492
struct mma7455_data *mma7455 = iio_priv(indio_dev);
85-
u8 buf[16]; /* 3 x 16-bit channels + padding + ts */
8693
int ret;
8794

8895
ret = mma7455_drdy(mma7455);
8996
if (ret)
9097
goto done;
9198

92-
ret = regmap_bulk_read(mma7455->regmap, MMA7455_REG_XOUTL, buf,
93-
sizeof(__le16) * 3);
99+
ret = regmap_bulk_read(mma7455->regmap, MMA7455_REG_XOUTL,
100+
mma7455->scan.channels,
101+
sizeof(mma7455->scan.channels));
94102
if (ret)
95103
goto done;
96104

97-
iio_push_to_buffers_with_timestamp(indio_dev, buf,
105+
iio_push_to_buffers_with_timestamp(indio_dev, &mma7455->scan,
98106
iio_get_time_ns(indio_dev));
99107

100108
done:

0 commit comments

Comments
 (0)