diff mbox series

[5.4,24/37] i2c: validate user data in compat ioctl

Message ID	20220103142052.623863257@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Pavel Skripkin <paskripkin@gmail.com>, Wolfram Sang <wsa@kernel.org>, Sasha Levin <sashal@kernel.org>, syzbot+e417648b303855b91d8a@syzkaller.appspotmail.com Subject: [PATCH 5.4 24/37] i2c: validate user data in compat ioctl Date: Mon, 3 Jan 2022 15:24:02 +0100 Message-Id: <20220103142052.623863257@linuxfoundation.org> In-Reply-To: <20220103142051.883166998@linuxfoundation.org> References: <20220103142051.883166998@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.4,02/37] tee: handle lookup of shm with reference count 0 [5.4,03/37] Input: i8042 - add deferred probe support [5.4,04/37] Input: i8042 - enable deferred probe quirk for ASUS UM325UA [5.4,05/37] tomoyo: Check exceeded quota early in tomoyo_domain_quota_is_ok(). [5.4,06/37] platform/x86: apple-gmux: use resource_size() with res [5.4,07/37] memblock: fix memblock_phys_alloc() section mismatch error [5.4,08/37] recordmcount.pl: fix typo in s390 mcount regex [5.4,09/37] selinux: initialize proto variable in selinux_ip_postroute_compat() [5.4,10/37] scsi: lpfc: Terminate string in lpfc_debugfs_nvmeio_trc_write() [5.4,11/37] net/mlx5: DR, Fix NULL vs IS_ERR checking in dr_domain_init_resources [5.4,12/37] udp: using datalen to cap ipv6 udp max gso segments [5.4,13/37] selftests: Calculate udpgso segment count without header adjustment [5.4,14/37] net: phy: fixed_phy: Fix NULL vs IS_ERR() checking in __fixed_phy_register [5.4,15/37] sctp: use call_rcu to free endpoint [5.4,16/37] net: usb: pegasus: Do not drop long Ethernet frames [5.4,17/37] net: lantiq_xrx200: fix statistics of received bytes [5.4,18/37] NFC: st21nfca: Fix memory leak in device probe and remove [5.4,19/37] ionic: Initialize the lif->dbid_inuse bitmap [5.4,20/37] net/mlx5e: Fix wrong features assignment in case of error [5.4,21/37] selftests/net: udpgso_bench_tx: fix dst ip argument [5.4,22/37] net/ncsi: check for error return from call to nla_put_u32 [5.4,23/37] fsl/fman: Fix missing put_device() call in fman_port_probe [5.4,24/37] i2c: validate user data in compat ioctl [5.4,25/37] nfc: uapi: use kernel size_t to fix user-space builds [5.4,26/37] uapi: fix linux/nfc.h userspace compilation errors [5.4,27/37] xhci: Fresco FL1100 controller should not have BROKEN_MSI quirk set. [5.4,28/37] usb: gadget: f_fs: Clear ffs_eventfd in ffs_data_clear. [5.4,29/37] usb: mtu3: add memory barrier before set GPDs HWO [5.4,30/37] usb: mtu3: fix list_head check warning [5.4,31/37] usb: mtu3: set interval of FS intr and isoc endpoint [5.4,32/37] binder: fix async_free_space accounting for empty parcels [5.4,33/37] scsi: vmw_pvscsi: Set residual data length conditionally [5.4,34/37] Input: appletouch - initialize work before device registration [5.4,35/37] Input: spaceball - fix parsing of movement data packets [5.4,36/37] net: fix use-after-free in tw_timer_handler [5.4,37/37] perf script: Fix CPU filtering of a scripts switch events

Commit Message

Greg KH Jan. 3, 2022, 2:24 p.m. UTC

From: Pavel Skripkin <paskripkin@gmail.com>

[ Upstream commit bb436283e25aaf1533ce061605d23a9564447bdf ]

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>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/i2c/i2c-dev.c | 3 +++
 1 file changed, 3 insertions(+)

diff mbox series

Patch

diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index c9ae1895cd48a..7da6ca26a5f56 100644
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -536,6 +536,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;