6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adam Rizkalla ajarizzo@gmail.com
[ Upstream commit 0f0f6306617cb4b6231fc9d4ec68ab9a56dba7c0 ]
Fix overflow issue when storing BMP580 temperature reading and properly preserve sign of 24-bit data.
Signed-off-by: Adam Rizkalla ajarizzo@gmail.com Tested-By: Vasileios Amoiridis vassilisamir@gmail.com Acked-by: Angel Iglesias ang.iglesiasg@gmail.com Link: https://lore.kernel.org/r/Zin2udkXRD0+GrML@adam-asahi.lan Cc: Stable@vger.kernel.org Signed-off-by: Jonathan Cameron Jonathan.Cameron@huawei.com Signed-off-by: Sasha Levin sashal@kernel.org --- drivers/iio/pressure/bmp280-core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp280-core.c index 4c493db7db965..a65630d5742f0 100644 --- a/drivers/iio/pressure/bmp280-core.c +++ b/drivers/iio/pressure/bmp280-core.c @@ -1385,12 +1385,12 @@ static int bmp580_read_temp(struct bmp280_data *data, int *val, int *val2)
/* * Temperature is returned in Celsius degrees in fractional - * form down 2^16. We rescale by x1000 to return milli Celsius - * to respect IIO ABI. + * form down 2^16. We rescale by x1000 to return millidegrees + * Celsius to respect IIO ABI. */ - *val = raw_temp * 1000; - *val2 = 16; - return IIO_VAL_FRACTIONAL_LOG2; + raw_temp = sign_extend32(raw_temp, 23); + *val = ((s64)raw_temp * 1000) / (1 << 16); + return IIO_VAL_INT; }
static int bmp580_read_press(struct bmp280_data *data, int *val, int *val2)