AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-14 06:36:46 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

iio:humidity:hts221 Fix alignment and data leak issues

Browse Source 
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.

Explicit alignment of ts needed to ensure consistent padding
on all architectures (particularly x86_32 with it's 4 byte alignment
of s64)

Fixes: e4a70e3e7d ("iio: humidity: add support to hts221 rh/temp combo device")
Reported-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: <Stable@vger.kernel.org>
This commit is contained in:
Jonathan Cameron 2020-06-07 16:53:53 +01:00
parent ea5e7a7bb6
commit 5c49056ad9
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/iio/humidity/hts221.h
View File

@ -14,8 +14,6 @@
#include <linux/iio/iio.h> #include <linux/iio/iio.h>
#define HTS221_DATA_SIZE 2
enum hts221_sensor_type { enum hts221_sensor_type {
HTS221_SENSOR_H, HTS221_SENSOR_H,
HTS221_SENSOR_T, HTS221_SENSOR_T,
@ -39,6 +37,11 @@ struct hts221_hw {
bool enabled; bool enabled;
u8 odr; u8 odr;
/* Ensure natural alignment of timestamp */
struct {
__le16 channels[2];
s64 ts __aligned(8);
} scan;
}; };
extern const struct dev_pm_ops hts221_pm_ops; extern const struct dev_pm_ops hts221_pm_ops;

9
drivers/iio/humidity/hts221_buffer.c
View File

@ -160,7 +160,6 @@ static const struct iio_buffer_setup_ops hts221_buffer_ops = {
static irqreturn_t hts221_buffer_handler_thread(int irq, void *p) static irqreturn_t hts221_buffer_handler_thread(int irq, void *p)
{ {
u8 buffer[ALIGN(2 * HTS221_DATA_SIZE, sizeof(s64)) + sizeof(s64)];
struct iio_poll_func *pf = p; struct iio_poll_func *pf = p;
struct iio_dev *iio_dev = pf->indio_dev; struct iio_dev *iio_dev = pf->indio_dev;
struct hts221_hw *hw = iio_priv(iio_dev); struct hts221_hw *hw = iio_priv(iio_dev);
@ -170,18 +169,20 @@ static irqreturn_t hts221_buffer_handler_thread(int irq, void *p)
/* humidity data */ /* humidity data */
ch = &iio_dev->channels[HTS221_SENSOR_H]; ch = &iio_dev->channels[HTS221_SENSOR_H];
err = regmap_bulk_read(hw->regmap, ch->address, err = regmap_bulk_read(hw->regmap, ch->address,
buffer, HTS221_DATA_SIZE); &hw->scan.channels[0],
sizeof(hw->scan.channels[0]));
if (err < 0) if (err < 0)
goto out; goto out;
/* temperature data */ /* temperature data */
ch = &iio_dev->channels[HTS221_SENSOR_T]; ch = &iio_dev->channels[HTS221_SENSOR_T];
err = regmap_bulk_read(hw->regmap, ch->address, err = regmap_bulk_read(hw->regmap, ch->address,
buffer + HTS221_DATA_SIZE, HTS221_DATA_SIZE); &hw->scan.channels[1],
sizeof(hw->scan.channels[1]));
if (err < 0) if (err < 0)
goto out; goto out;
iio_push_to_buffers_with_timestamp(iio_dev, buffer, iio_push_to_buffers_with_timestamp(iio_dev, &hw->scan,
iio_get_time_ns(iio_dev)); iio_get_time_ns(iio_dev));
out: out: