Skip to content

Commit 043ccc9

Browse files
Stephen Douthitgregkh
authored andcommitted
i2c: ismt: Return EMSGSIZE for block reads with bogus length
commit ba201c4f5ebe13d7819081756378777d8153f23e 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 fab3229 commit 043ccc9

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
@@ -339,8 +339,10 @@ static int ismt_process_desc(const struct ismt_desc *desc,
339339
break;
340340
case I2C_SMBUS_BLOCK_DATA:
341341
case I2C_SMBUS_I2C_BLOCK_DATA:
342+
if (desc->rxbytes != dma_buffer[0] + 1)
343+
return -EMSGSIZE;
344+
342345
memcpy(data->block, dma_buffer, desc->rxbytes);
343-
data->block[0] = desc->rxbytes - 1;
344346
break;
345347
}
346348
return 0;

0 commit comments

Comments
 (0)