Message ID | 1557238832-10723-1-git-send-email-yingjoe.chen@mediatek.com (mailing list archive) |
---|---|
State | Mainlined, archived |
Commit | a0692f0eef91354b62c2b4c94954536536be5425 |
Headers | show |
Series | i2c: dev: fix potential memory leak in i2cdev_ioctl_rdwr | expand |
On Tue, May 07, 2019 at 10:20:32PM +0800, Yingjoe Chen wrote: > 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> Nice catch. Applied to for-current, thanks!
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c index 3f7b9af..776f366 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; }
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> --- Only check arm64 defconfig build pass. I haven't test it since it just fix memleak for error cases. --- drivers/i2c/i2c-dev.c | 1 + 1 file changed, 1 insertion(+)