iio: imu: st_lsm6dsx: fix possible lockup in st_lsm6dsx_read_fifo
Subsystems (2)
PATCH v3 1/2 iio: imu: st_lsm6dsx: fix possible lockup in st_lsm6dsx_read_fifo
Prevent st_lsm6dsx_read_fifo from falling in an infinite loop in case pattern_len is equal to zero and the device FIFO is not empty.
---
Changes since v1:
* st_lsm6dsx_read_fifo: moved check for zero pattern_len before fifo_len assignment
* st_lsm6dsx_read_fifo: dropped check for zero fifo_len
* added Fixes tags in commit message
Changes since v2:
* split patch in two parts, one fixing st_lsm6dsx_read_fifo and one fixing st_lsm6dsx_read_tagged_fifo
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c +3 -0
@@ -392,6 +392,9 @@ int st_lsm6dsx_read_fifo(struct st_lsm6dsx_hw *hw)if (fifo_status &cpu_to_le16 (ST_LSM6DSX_FIFO_EMPTY_MASK ))return 0 ; +if (!pattern_len) + pattern_len =ST_LSM6DSX_SAMPLE_SIZE ; + fifo_len = (le16_to_cpu (fifo_status) & fifo_diff_mask) *ST_LSM6DSX_CHAN_SIZE ; fifo_len = (fifo_len / pattern_len) * pattern_len;
Signature · 1 line
2.48.1
PATCH v3 2/2 iio: imu: st_lsm6dsx: fix possible lockup in st_lsm6dsx_read_tagged_fifo
Prevent st_lsm6dsx_read_tagged_fifo from falling in an infinite loop in case pattern_len is equal to zero and the device FIFO is not empty.
---
Changes since v1:
* st_lsm6dsx_read_fifo: moved check for zero pattern_len before fifo_len assignment
* st_lsm6dsx_read_fifo: dropped check for zero fifo_len
* added Fixes tags in commit message
Changes since v2:
* split patch in two parts, one fixing st_lsm6dsx_read_fifo and one fixing st_lsm6dsx_read_tagged_fifo
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c +3 -0
@@ -626,6 +626,9 @@ int st_lsm6dsx_read_tagged_fifo(struct st_lsm6dsx_hw *hw)if (!fifo_len)return 0 ; +if (!pattern_len) + pattern_len =ST_LSM6DSX_TAGGED_SAMPLE_SIZE ; +for (read_len =0 ; read_len < fifo_len; read_len += pattern_len) { err = st_lsm6dsx_read_block(hw, ST_LSM6DSX_REG_FIFO_OUT_TAG_ADDR,
Signature · 1 line
2.48.1
Jonathan Cameron
maintainerQuoted 5 lines · On Tue, 11 Mar 2025 09:49:47 +0100 Silvano Seva <[email protected]> wrote:
Prevent
st_lsm6dsx_read_fifofrom falling in an infinite loop in casepattern_lenis equal to zero and the device FIFO is not empty.Fixes 290a6ce11d93 ("iio: imu: add support to lsm6dsx driver")Signed-off-by Silvano Seva <[email protected]>
I think you could validly have kept Lorenzo's ack given this was just breaking the patch into two parts. I put it back and applied these with them marked for stable to the fixes-togreg branch of iio.git
Thanks,
Jonathan
Quoted 28 lines
---
Changes since v1:
*st_lsm6dsx_read_fifo: moved check for zeropattern_lenbeforefifo_lenassignment
*st_lsm6dsx_read_fifo: dropped check for zerofifo_len
* added Fixes tags in commit messageChanges since v2:
* split patch in two parts, one fixingst_lsm6dsx_read_fifoand one fixingst_lsm6dsx_read_tagged_fifodrivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 3 +++ 1 file changed, 3 insertions(+)drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c +3
-0@@ -392,6 +392,9 @@ int st_lsm6dsx_read_fifo(struct st_lsm6dsx_hw *hw)if (fifo_status &cpu_to_le16 (ST_LSM6DSX_FIFO_EMPTY_MASK ))return 0 ; +if (!pattern_len) + pattern_len =ST_LSM6DSX_SAMPLE_SIZE ; + fifo_len = (le16_to_cpu (fifo_status) & fifo_diff_mask) *ST_LSM6DSX_CHAN_SIZE ; fifo_len = (fifo_len / pattern_len) * pattern_len;
Quoted 4 lines · Jonathan Cameron
On Tue, 11 Mar 2025 09:49:47 +0100
Silvano Seva <[email protected]> wrote:
Quoted 9 lines
Quoted 5 lines
Prevent
st_lsm6dsx_read_fifofrom falling in an infinite loop in casepattern_lenis equal to zero and the device FIFO is not empty.Fixes 290a6ce11d93 ("iio: imu: add support to lsm6dsx driver")Signed-off-by Silvano Seva <[email protected]>I think you could validly have kept Lorenzo's ack given this was just breaking the patch into two parts. I put it back and applied these with them marked for stable to the fixes-togreg branch of iio.git
Yes, sorry. I mistakenly dropped the "acked-by" when splitting the patch.
Thank you,
Silvano.