diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-01 15:03:13 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-01 15:03:13 -0700 |
commit | f8c6d7246a380fd8d13ebc3f7dac2495dc53db47 (patch) | |
tree | e7d6dfd31f99aed57411e927a755e6ac3b7eb2fb /drivers/i2c/busses/i2c-ismt.c | |
parent | 138e4ad67afd5c6c318b056b4d17c17f2c0ca5c0 (diff) | |
parent | 231d069fcde22bd0582c2c9564f1b334d280c7d7 (diff) | |
download | op-kernel-dev-f8c6d7246a380fd8d13ebc3f7dac2495dc53db47.zip op-kernel-dev-f8c6d7246a380fd8d13ebc3f7dac2495dc53db47.tar.gz |
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"The ismt driver had a problem with a rarely used transaction type and
the designware driver was made even more robust against non standard
ACPI tables"
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: designware: Round down ACPI provided clk to nearest supported clk
i2c: ismt: Return EMSGSIZE for block reads with bogus length
i2c: ismt: Don't duplicate the receive length for block reads
Diffstat (limited to 'drivers/i2c/busses/i2c-ismt.c')
-rw-r--r-- | drivers/i2c/busses/i2c-ismt.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-ismt.c b/drivers/i2c/busses/i2c-ismt.c index e98e44e..22ffcb7 100644 --- a/drivers/i2c/busses/i2c-ismt.c +++ b/drivers/i2c/busses/i2c-ismt.c @@ -341,8 +341,10 @@ static int ismt_process_desc(const struct ismt_desc *desc, break; case I2C_SMBUS_BLOCK_DATA: case I2C_SMBUS_I2C_BLOCK_DATA: - memcpy(&data->block[1], dma_buffer, desc->rxbytes); - data->block[0] = desc->rxbytes; + if (desc->rxbytes != dma_buffer[0] + 1) + return -EMSGSIZE; + + memcpy(data->block, dma_buffer, desc->rxbytes); break; } return 0; |