Commit f6580228 authored by Jonathan Cameron's avatar Jonathan Cameron

iio: accel: mxc4005: Fix overread of data and alignment issue.

The bulk read size is based on the size of an array that also has
space for the timestamp alongside the channels.
Fix that and also fix alignment of the buffer passed
to iio_push_to_buffers_with_timestamp.

Found during an audit of all calls to this function.

Fixes: 1ce0eda0 ("iio: mxc4005: add triggered buffer mode for mxc4005")
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20210501170121.512209-6-jic23@kernel.org
parent 3ab3aa2e
...@@ -56,7 +56,11 @@ struct mxc4005_data { ...@@ -56,7 +56,11 @@ struct mxc4005_data {
struct mutex mutex; struct mutex mutex;
struct regmap *regmap; struct regmap *regmap;
struct iio_trigger *dready_trig; struct iio_trigger *dready_trig;
__be16 buffer[8]; /* Ensure timestamp is naturally aligned */
struct {
__be16 chans[3];
s64 timestamp __aligned(8);
} scan;
bool trigger_enabled; bool trigger_enabled;
}; };
...@@ -135,7 +139,7 @@ static int mxc4005_read_xyz(struct mxc4005_data *data) ...@@ -135,7 +139,7 @@ static int mxc4005_read_xyz(struct mxc4005_data *data)
int ret; int ret;
ret = regmap_bulk_read(data->regmap, MXC4005_REG_XOUT_UPPER, ret = regmap_bulk_read(data->regmap, MXC4005_REG_XOUT_UPPER,
data->buffer, sizeof(data->buffer)); data->scan.chans, sizeof(data->scan.chans));
if (ret < 0) { if (ret < 0) {
dev_err(data->dev, "failed to read axes\n"); dev_err(data->dev, "failed to read axes\n");
return ret; return ret;
...@@ -301,7 +305,7 @@ static irqreturn_t mxc4005_trigger_handler(int irq, void *private) ...@@ -301,7 +305,7 @@ static irqreturn_t mxc4005_trigger_handler(int irq, void *private)
if (ret < 0) if (ret < 0)
goto err; goto err;
iio_push_to_buffers_with_timestamp(indio_dev, data->buffer, iio_push_to_buffers_with_timestamp(indio_dev, &data->scan,
pf->timestamp); pf->timestamp);
err: err:
......
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