Skip to content

Commit 91a0e1e

Browse files
Stephen Douthitgregkh
authored andcommitted
i2c: ismt: Return EMSGSIZE for block reads with bogus length
commit ba201c4 upstream. Compare the number of bytes actually seen on the wire to the byte count field returned by the slave device. Previously we just overwrote the byte count returned by the slave with the real byte count and let the caller figure out if the message was sane. Signed-off-by: Stephen Douthit <stephend@adiengineering.com> Tested-by: Dan Priamo <danp@adiengineering.com> Acked-by: Neil Horman <nhorman@tuxdriver.com> Signed-off-by: Wolfram Sang <wsa@the-dreams.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent d22f6da commit 91a0e1e

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

drivers/i2c/busses/i2c-ismt.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,8 +341,10 @@ static int ismt_process_desc(const struct ismt_desc *desc,
341341
break;
342342
case I2C_SMBUS_BLOCK_DATA:
343343
case I2C_SMBUS_I2C_BLOCK_DATA:
344+
if (desc->rxbytes != dma_buffer[0] + 1)
345+
return -EMSGSIZE;
346+
344347
memcpy(data->block, dma_buffer, desc->rxbytes);
345-
data->block[0] = desc->rxbytes - 1;
346348
break;
347349
}
348350
return 0;

0 commit comments

Comments
 (0)