Skip to content

Commit db8f06d

Browse files
committed
iio:adc:max1118 Fix alignment of timestamp and data leak issues
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. This data is allocated with kzalloc so no data can leak apart from previous readings. The explicit alignment of ts is necessary to ensure correct padding on architectures where s64 is only 4 bytes aligned such as x86_32. Fixes: a9e9c71 ("iio: adc: add max1117/max1118/max1119 ADC driver") Reported-by: Lars-Peter Clausen <lars@metafoo.de> Cc: Akinobu Mita <akinobu.mita@gmail.com> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Cc: <Stable@vger.kernel.org>
1 parent f8cd222 commit db8f06d

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

drivers/iio/adc/max1118.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ struct max1118 {
3636
struct spi_device *spi;
3737
struct mutex lock;
3838
struct regulator *reg;
39+
/* Ensure natural alignment of buffer elements */
40+
struct {
41+
u8 channels[2];
42+
s64 ts __aligned(8);
43+
} scan;
3944

4045
u8 data ____cacheline_aligned;
4146
};
@@ -166,7 +171,6 @@ static irqreturn_t max1118_trigger_handler(int irq, void *p)
166171
struct iio_poll_func *pf = p;
167172
struct iio_dev *indio_dev = pf->indio_dev;
168173
struct max1118 *adc = iio_priv(indio_dev);
169-
u8 data[16] = { }; /* 2x 8-bit ADC data + padding + 8 bytes timestamp */
170174
int scan_index;
171175
int i = 0;
172176

@@ -184,10 +188,10 @@ static irqreturn_t max1118_trigger_handler(int irq, void *p)
184188
goto out;
185189
}
186190

187-
data[i] = ret;
191+
adc->scan.channels[i] = ret;
188192
i++;
189193
}
190-
iio_push_to_buffers_with_timestamp(indio_dev, data,
194+
iio_push_to_buffers_with_timestamp(indio_dev, &adc->scan,
191195
iio_get_time_ns(indio_dev));
192196
out:
193197
mutex_unlock(&adc->lock);

0 commit comments

Comments
 (0)