linux-i2c.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pavel Skripkin <paskripkin@gmail.com>
To: wsa@kernel.org, viro@zeniv.linux.org.uk
Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org,
	Pavel Skripkin <paskripkin@gmail.com>,
	syzbot+e417648b303855b91d8a@syzkaller.appspotmail.com
Subject: [PATCH v3] i2c: validate user data in compat ioctl
Date: Fri, 31 Dec 2021 01:47:50 +0300	[thread overview]
Message-ID: <20211230224750.15380-1-paskripkin@gmail.com> (raw)
In-Reply-To: <Yc4wkyr7QTs8ao5x@kunai>

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
warnings

Reported-and-tested-by: syzbot+e417648b303855b91d8a@syzkaller.appspotmail.com
Fixes: 7d5cb45655f2 ("i2c compat ioctls: move to ->compat_ioctl()")
Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
---

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(+)

diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index bce0e8bb7852..cf5d049342ea 100644
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -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;
 
-- 
2.34.1


  parent reply	other threads:[~2021-12-30 22:47 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-25 14:28 [PATCH] i2c: don't pass 0 nmsgs to i2c_transfer Pavel Skripkin
2021-12-25 18:24 ` [PATCH v2] " Pavel Skripkin
2021-12-30 22:20   ` Wolfram Sang
2021-12-30 22:26     ` Pavel Skripkin
2021-12-30 22:47     ` Pavel Skripkin [this message]
2021-12-31 13:31       ` [PATCH v3] i2c: validate user data in compat ioctl Wolfram Sang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211230224750.15380-1-paskripkin@gmail.com \
    --to=paskripkin@gmail.com \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=syzbot+e417648b303855b91d8a@syzkaller.appspotmail.com \
    --cc=viro@zeniv.linux.org.uk \
    --cc=wsa@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).