i2c: stub: Avoid an array overrun on I2C block transfers

I2C block transfers can have a size up to 32 bytes. If starting close
to the end of the address space, there may not be enough room to write
that many bytes (on I2C block writes) or not enough bytes to be read
(on I2C block reads.) In that case, we must shorten the transfer so
that it does not exceed the address space.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

diff --git a/drivers/i2c/i2c-stub.c b/drivers/i2c/i2c-stub.c
index e815c6067ff3107d9523544a21471fad9e080f31..d241aa295d96907d942c60290cfd89f54880330e 100644 (file)
--- a/drivers/i2c/i2c-stub.c
+++ b/drivers/i2c/i2c-stub.c
@@ -226,6 +226,8 @@ static s32 stub_xfer(struct i2c_adapter *adap, u16 addr, unsigned short flags,
                 * We ignore banks here, because banked chips don't use I2C
                 * block transfers
                 */
+               if (data->block[0] > 256 - command)     /* Avoid overrun */
+                       data->block[0] = 256 - command;
                len = data->block[0];
                if (read_write == I2C_SMBUS_WRITE) {
                        for (i = 0; i < len; i++) {