i2c: mlxcpld: check correct size of maximum RECV_LEN packet (9d60af5c) · Commits · e / devices / android_kernel_fairphone_FP5

[ Upstream commit 597911287fcd13c3a4b4aa3e0a52b33d431e0a8e ] I2C_SMBUS_BLOCK_MAX defines already the maximum number as defined in the SMBus 2.0 specs. I don't see a reason to add 1 here. Also, fix the errno to what is suggested for this error. Fixes: ("i2c: mlxcpld: Add support for smbus block read transaction") Signed-off-by:

Wolfram Sang <wsa+renesas@sang-engineering.com> Reviewed-by:

Michael Shych <michaelsh@mellanox.com> Tested-by:

Michael Shych <michaelsh@mellanox.com> Signed-off-by:

Wolfram Sang <wsa@kernel.org> Signed-off-by:

Sasha Levin <sashal@kernel.org>

drivers/i2c/busses/i2c-mlxcpld.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -337,9 +337,9 @@ static int mlxcpld_i2c_wait_for_tc(struct mlxcpld_i2c_priv *priv)
	if (priv->smbus_block && (val & MLXCPLD_I2C_SMBUS_BLK_BIT)) {		if (priv->smbus_block && (val & MLXCPLD_I2C_SMBUS_BLK_BIT)) {
	mlxcpld_i2c_read_comm(priv, MLXCPLD_LPCI2C_NUM_DAT_REG,		mlxcpld_i2c_read_comm(priv, MLXCPLD_LPCI2C_NUM_DAT_REG,
	&datalen, 1);		&datalen, 1);
	if (unlikely(datalen > (I2C_SMBUS_BLOCK_MAX + 1))) {		if (unlikely(datalen > I2C_SMBUS_BLOCK_MAX)) {
	dev_err(priv->dev, "Incorrect smbus block read message len\n");		dev_err(priv->dev, "Incorrect smbus block read message len\n");
	return -E2BIG;		return -EPROTO;
	}		}
	} else {		} else {
	datalen = priv->xfer.data_len;		datalen = priv->xfer.data_len;