diff options
| author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2021-03-12 12:57:34 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-22 10:59:40 +0200 |
| commit | e3792886dc2eef6dc0d23b6167c9d9af70d8ea85 (patch) | |
| tree | 7afd63661f327eaf665febb81da13e34d608d0a8 /drivers/i2c/i2c-dev.c | |
| parent | 9bb628ef37f817c8ec1db1b6844d9b2a0cab4f73 (diff) | |
| download | linux-stable-e3792886dc2eef6dc0d23b6167c9d9af70d8ea85.tar.gz linux-stable-e3792886dc2eef6dc0d23b6167c9d9af70d8ea85.tar.bz2 linux-stable-e3792886dc2eef6dc0d23b6167c9d9af70d8ea85.zip | |
i2c: bail out early when RDWR parameters are wrong
[ Upstream commit 71581562ee36032d2d574a9b23ad4af6d6a64cf7 ]
The buggy parameters currently get caught later, but emit a noisy WARN.
Userspace should not be able to trigger this, so add similar checks much
earlier. Also avoids some unneeded code paths, of course. Apply kernel
coding stlye to a comment while here.
Reported-by: syzbot+ffb0b3ffa6cfbc7d7b3f@syzkaller.appspotmail.com
Tested-by: syzbot+ffb0b3ffa6cfbc7d7b3f@syzkaller.appspotmail.com
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/i2c/i2c-dev.c')
| -rw-r--r-- | drivers/i2c/i2c-dev.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c index cbda91a0cb5f..1d10ee86299d 100644 --- a/drivers/i2c/i2c-dev.c +++ b/drivers/i2c/i2c-dev.c @@ -448,8 +448,13 @@ static long i2cdev_ioctl(struct file *file, unsigned int cmd, unsigned long arg) sizeof(rdwr_arg))) return -EFAULT; - /* Put an arbitrary limit on the number of messages that can - * be sent at once */ + if (!rdwr_arg.msgs || rdwr_arg.nmsgs == 0) + return -EINVAL; + + /* + * Put an arbitrary limit on the number of messages that can + * be sent at once + */ if (rdwr_arg.nmsgs > I2C_RDWR_IOCTL_MAX_MSGS) return -EINVAL; |