diff mbox series

[5.10,32/48] i2c: validate user data in compat ioctl

Message ID	20220103142054.558250813@linuxfoundation.org
State	New
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.10 32/48] i2c: validate user data in compat ioctl Date: Mon, 3 Jan 2022 15:24:09 +0100 Message-Id: <20220103142054.558250813@linuxfoundation.org> In-Reply-To: <20220103142053.466768714@linuxfoundation.org> References: <20220103142053.466768714@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.10,02/48] Input: i8042 - enable deferred probe quirk for ASUS UM325UA [5.10,03/48] tomoyo: Check exceeded quota early in tomoyo_domain_quota_is_ok(). [5.10,04/48] tomoyo: use hwight16() in tomoyo_domain_quota_is_ok() [5.10,05/48] parisc: Clear stale IIR value on instruction access rights trap [5.10,06/48] platform/x86: apple-gmux: use resource_size() with res [5.10,07/48] memblock: fix memblock_phys_alloc() section mismatch error [5.10,08/48] recordmcount.pl: fix typo in s390 mcount regex [5.10,09/48] selinux: initialize proto variable in selinux_ip_postroute_compat() [5.10,10/48] scsi: lpfc: Terminate string in lpfc_debugfs_nvmeio_trc_write() [5.10,11/48] net/mlx5: DR, Fix NULL vs IS_ERR checking in dr_domain_init_resources [5.10,12/48] net/mlx5e: Wrap the tx reporter dump callback to extract the sq [5.10,13/48] net/mlx5e: Fix ICOSQ recovery flow for XSK [5.10,14/48] udp: using datalen to cap ipv6 udp max gso segments [5.10,15/48] selftests: Calculate udpgso segment count without header adjustment [5.10,16/48] net: phy: fixed_phy: Fix NULL vs IS_ERR() checking in __fixed_phy_register [5.10,17/48] sctp: use call_rcu to free endpoint [5.10,18/48] net/smc: fix using of uninitialized completions [5.10,19/48] net: usb: pegasus: Do not drop long Ethernet frames [5.10,20/48] net: ag71xx: Fix a potential double free in error handling paths [5.10,21/48] net: lantiq_xrx200: fix statistics of received bytes [5.10,22/48] NFC: st21nfca: Fix memory leak in device probe and remove [5.10,23/48] net/smc: improved fix wait on already cleared link [5.10,24/48] net/smc: dont send CDC/LLC message if link not ready [5.10,25/48] net/smc: fix kernel panic caused by race of smc_sock [5.10,26/48] igc: Fix TX timestamp support for non-MSI-X platforms [5.10,27/48] ionic: Initialize the lif->dbid_inuse bitmap [5.10,28/48] net/mlx5e: Fix wrong features assignment in case of error [5.10,29/48] selftests/net: udpgso_bench_tx: fix dst ip argument [5.10,30/48] net/ncsi: check for error return from call to nla_put_u32 [5.10,31/48] fsl/fman: Fix missing put_device() call in fman_port_probe [5.10,32/48] i2c: validate user data in compat ioctl [5.10,33/48] nfc: uapi: use kernel size_t to fix user-space builds [5.10,34/48] uapi: fix linux/nfc.h userspace compilation errors [5.10,35/48] drm/amdgpu: When the VCN(1.0) block is suspended, powergating is explicitly enabled [5.10,36/48] drm/amdgpu: add support for IP discovery gc_info table v2 [5.10,37/48] xhci: Fresco FL1100 controller should not have BROKEN_MSI quirk set. [5.10,38/48] usb: gadget: f_fs: Clear ffs_eventfd in ffs_data_clear. [5.10,39/48] usb: mtu3: add memory barrier before set GPDs HWO [5.10,40/48] usb: mtu3: fix list_head check warning [5.10,41/48] usb: mtu3: set interval of FS intr and isoc endpoint [5.10,42/48] binder: fix async_free_space accounting for empty parcels [5.10,43/48] scsi: vmw_pvscsi: Set residual data length conditionally [5.10,44/48] Input: appletouch - initialize work before device registration [5.10,45/48] Input: spaceball - fix parsing of movement data packets [5.10,46/48] net: fix use-after-free in tw_timer_handler [5.10,47/48] perf script: Fix CPU filtering of a scripts switch events [5.10,48/48] bpf: Add kconfig knob for disabling unpriv bpf by default

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 f358120d59b38..dafad891998ec 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;