Skip to content

Commit b126097

Browse files
Qingwu-LiWolfram Sang
authored andcommitted
i2c: imx: preserve error state in block data length handler
When a block read returns an invalid length, zero or >I2C_SMBUS_BLOCK_MAX, the length handler sets the state to IMX_I2C_STATE_FAILED. However, i2c_imx_master_isr() unconditionally overwrites this with IMX_I2C_STATE_READ_CONTINUE, causing an endless read loop that overruns buffers and crashes the system. Guard the state transition to preserve error states set by the length handler. Fixes: 5f5c2d4 ("i2c: imx: prevent rescheduling in non dma mode") Signed-off-by: LI Qingwu <Qing-wu.Li@leica-geosystems.com.cn> Cc: <stable@vger.kernel.org> # v6.13+ Reviewed-by: Stefan Eichenberger <eichest@gmail.com> Signed-off-by: Andi Shyti <andi.shyti@kernel.org> Link: https://lore.kernel.org/r/20260116111906.3413346-2-Qing-wu.Li@leica-geosystems.com.cn Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
1 parent 18f7fcd commit b126097

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/i2c/busses/i2c-imx.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1103,7 +1103,8 @@ static irqreturn_t i2c_imx_master_isr(struct imx_i2c_struct *i2c_imx, unsigned i
11031103

11041104
case IMX_I2C_STATE_READ_BLOCK_DATA_LEN:
11051105
i2c_imx_isr_read_block_data_len(i2c_imx);
1106-
i2c_imx->state = IMX_I2C_STATE_READ_CONTINUE;
1106+
if (i2c_imx->state == IMX_I2C_STATE_READ_BLOCK_DATA_LEN)
1107+
i2c_imx->state = IMX_I2C_STATE_READ_CONTINUE;
11071108
break;
11081109

11091110
case IMX_I2C_STATE_WRITE:

0 commit comments

Comments
 (0)