i2c: don't pass 0 nmsgs to i2c_transfer
Subsystems (2)
PATCH 1/1 i2c: don't pass 0 nmsgs to i2c_transfer
We should not pass 0 nmsgs to i2c_transfer(), since it will cause warning. This patch addd missing validion check to prevent passing 0 nmsgs.
--- drivers/i2c/i2c-dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/i2c-dev.c +1 -1
@@ -535,7 +535,7 @@ static long compat_i2cdev_ioctl(struct file *file, unsigned int cmd, unsigned lo sizeof(rdwr_arg)))return -EFAULT ; -if (rdwr_arg.nmsgs >I2C_RDWR_IOCTL_MAX_MSGS ) +if (!rdwr_arg.nmsgs || rdwr_arg.nmsgs >I2C_RDWR_IOCTL_MAX_MSGS )return -EINVAL ; rdwr_pa = kmalloc_array(rdwr_arg.nmsgs, sizeof(struct i2c_msg),
Signature · 1 line
2.34.1
PATCH v2 1/1 i2c: don't pass 0 nmsgs to i2c_transfer
We should not pass 0 nmsgs to i2c_transfer(), since it will cause warning. This patch adds missing validation check to prevent passing 0 nmsgs to i2c_transfer().
---
Changes in v2:
- Fixed typos in commit message
--- drivers/i2c/i2c-dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/i2c-dev.c +1 -1
@@ -535,7 +535,7 @@ static long compat_i2cdev_ioctl(struct file *file, unsigned int cmd, unsigned lo sizeof(rdwr_arg)))return -EFAULT ; -if (rdwr_arg.nmsgs >I2C_RDWR_IOCTL_MAX_MSGS ) +if (!rdwr_arg.nmsgs || rdwr_arg.nmsgs >I2C_RDWR_IOCTL_MAX_MSGS )return -EINVAL ; rdwr_pa = kmalloc_array(rdwr_arg.nmsgs, sizeof(struct i2c_msg),
Signature · 1 line
2.34.1
drivers/i2c/i2c-dev.c static long compat_i2cdev_ioctl(struct file *file, unsigned int cmd, unsigned lo · line 539
Quoted 3 lines
drivers/i2c/i2c-dev.c +1
-1-if (rdwr_arg.nmsgs >I2C_RDWR_IOCTL_MAX_MSGS ) +if (!rdwr_arg.nmsgs || rdwr_arg.nmsgs >I2C_RDWR_IOCTL_MAX_MSGS )return -EINVAL ;
Shouldn't we check the msgs pointer as well while we are here? Like in the non-compat IOCTL code:
443 if (!rdwr_arg.msgs || rdwr_arg.nmsgs == 0)
444 return -EINVAL;
Quoted 11 lines · Wolfram Sang
drivers/i2c/i2c-dev.c static long compat_i2cdev_ioctl(struct file *file, unsigned int cmd, unsigned lo · line 539
Quoted 3 lines
drivers/i2c/i2c-dev.c +1
-1-if (rdwr_arg.nmsgs >I2C_RDWR_IOCTL_MAX_MSGS ) +if (!rdwr_arg.nmsgs || rdwr_arg.nmsgs >I2C_RDWR_IOCTL_MAX_MSGS )return -EINVAL ;Shouldn't we check the msgs pointer as well while we are here? Like in the non-compat IOCTL code:
443 if (!rdwr_arg.msgs || rdwr_arg.nmsgs == 0)
444 return-EINVAL;
Sure! Will prepare v2, thanks for review
With regards,
Pavel Skripkin
PATCH v3 1/1 i2c: validate user data in compat ioctl
In reply to Wolfram SangWrong user data may cause warning in i2c_transfer(), ex: zero msgs. Userspace should not be able to trigger warnings, so this patch adds validation checks for user data in compact ioctl to prevent reported warnings
---
Changes in v3
- Add rdwr_arg.nmsgs == 0 check as Wolfram suggested
Changes in v2:
- Fixed typos in commit message
--- drivers/i2c/i2c-dev.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/i2c/i2c-dev.c +3 -0
@@ -535,6 +535,9 @@ static long compat_i2cdev_ioctl(struct file *file, unsigned int cmd, unsigned lo sizeof(rdwr_arg)))return -EFAULT ; +if (!rdwr_arg.msgs || rdwr_arg.nmsgs ==0 ) +return -EINVAL ; +if (rdwr_arg.nmsgs >I2C_RDWR_IOCTL_MAX_MSGS )return -EINVAL ;
Signature · 1 line
2.34.1
Wolfram Sang
AppliedRe: [PATCH v3] i2c: validate user data in compat ioctl
Quoted 8 lines · Pavel Skripkin
Wrong user data may cause warning in
i2c_transfer(), ex: zero msgs. Userspace should not be able to trigger warnings, so this patch adds validation checks for user data in compact ioctl to prevent reported warningsReported-and-tested-by [email protected]Fixes 7d5cb45655f2 ("i2c compat ioctls: move to ->compat_ioctl()")Signed-off-by Pavel Skripkin <[email protected]>
Applied to for-current, thanks!