summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYingjoe Chen <yingjoe.chen@mediatek.com>2019-05-07 22:20:32 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-22 08:15:17 +0200
commit7bea5618eaf9fbff3fa9a75989995042cf4cce21 (patch)
treec62057d60542b4553a0075c299b3b94c11dfded9
parent197501af7ff30afc6362f0ed0be9a6bc248e74ca (diff)
downloadlinux-rpi3-7bea5618eaf9fbff3fa9a75989995042cf4cce21.tar.gz
linux-rpi3-7bea5618eaf9fbff3fa9a75989995042cf4cce21.tar.bz2
linux-rpi3-7bea5618eaf9fbff3fa9a75989995042cf4cce21.zip
i2c: dev: fix potential memory leak in i2cdev_ioctl_rdwr
[ Upstream commit a0692f0eef91354b62c2b4c94954536536be5425 ] If I2C_M_RECV_LEN check failed, msgs[i].buf allocated by memdup_user will not be freed. Pump index up so it will be freed. Fixes: 838bfa6049fb ("i2c-dev: Add support for I2C_M_RECV_LEN") Signed-off-by: Yingjoe Chen <yingjoe.chen@mediatek.com> Signed-off-by: Wolfram Sang <wsa@the-dreams.de> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/i2c/i2c-dev.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index ccd76c71af09..cb07651f4b46 100644
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -283,6 +283,7 @@ static noinline int i2cdev_ioctl_rdwr(struct i2c_client *client,
msgs[i].len < 1 || msgs[i].buf[0] < 1 ||
msgs[i].len < msgs[i].buf[0] +
I2C_SMBUS_BLOCK_MAX) {
+ i++;
res = -EINVAL;
break;
}