Skip to content

Commit 06418cb

Browse files
jonasjelonekAndi Shyti
authored andcommitted
i2c: rtl9300: ensure data length is within supported range
Add an explicit check for the xfer length to 'rtl9300_i2c_config_xfer' to ensure the data length isn't within the supported range. In particular a data length of 0 is not supported by the hardware and causes unintended or destructive behaviour. This limitation becomes obvious when looking at the register documentation [1]. 4 bits are reserved for DATA_WIDTH and the value of these 4 bits is used as N + 1, allowing a data length range of 1 <= len <= 16. Affected by this is the SMBus Quick Operation which works with a data length of 0. Passing 0 as the length causes an underflow of the value due to: (len - 1) & 0xf and effectively specifying a transfer length of 16 via the registers. This causes a 16-byte write operation instead of a Quick Write. For example, on SFP modules without write-protected EEPROM this soft-bricks them by overwriting some initial bytes. For completeness, also add a quirk for the zero length. [1] https://svanheule.net/realtek/longan/register/i2c_mst1_ctrl2 Fixes: c366be7 ("i2c: Add driver for the RTL9300 I2C controller") Cc: [email protected] # v6.13+ Signed-off-by: Jonas Jelonek <[email protected]> Tested-by: Sven Eckelmann <[email protected]> Reviewed-by: Chris Packham <[email protected]> Tested-by: Chris Packham <[email protected]> # On RTL9302C based board Tested-by: Markus Stockhausen <[email protected]> Signed-off-by: Andi Shyti <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent cd6c956 commit 06418cb

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

drivers/i2c/busses/i2c-rtl9300.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,9 @@ static int rtl9300_i2c_config_xfer(struct rtl9300_i2c *i2c, struct rtl9300_i2c_c
9999
{
100100
u32 val, mask;
101101

102+
if (len < 1 || len > 16)
103+
return -EINVAL;
104+
102105
val = chan->bus_freq << RTL9300_I2C_MST_CTRL2_SCL_FREQ_OFS;
103106
mask = RTL9300_I2C_MST_CTRL2_SCL_FREQ_MASK;
104107

@@ -323,7 +326,7 @@ static const struct i2c_algorithm rtl9300_i2c_algo = {
323326
};
324327

325328
static struct i2c_adapter_quirks rtl9300_i2c_quirks = {
326-
.flags = I2C_AQ_NO_CLK_STRETCH,
329+
.flags = I2C_AQ_NO_CLK_STRETCH | I2C_AQ_NO_ZERO_LEN,
327330
.max_read_len = 16,
328331
.max_write_len = 16,
329332
};

0 commit comments

Comments
 (0)