Commit 859431ac authored Jan 02, 2022 by Linus Torvalds

Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

Pull i2c fixes from Wolfram Sang:
 "Better input validation for compat ioctls and a documentation bugfix
  for 5.16"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  Docs: Fixes link to I2C specification
  i2c: validate user data in compat ioctl

parents 1286cc48 c116fe1e

Documentation/i2c/summary.rst

+5 −3

Original line number	Diff line number	Diff line
		@@ -11,9 +11,11 @@ systems. Some systems use variants that don't meet branding requirements,
		and so are not advertised as being I2C but come under different names,
		e.g. TWI (Two Wire Interface), IIC.

		The official I2C specification is the `"I2C-bus specification and user
		manual" (UM10204) <https://www.nxp.com/docs/en/user-guide/UM10204.pdf>`_
		published by NXP Semiconductors.
		The latest official I2C specification is the `"I2C-bus specification and user
		manual" (UM10204) <https://www.nxp.com/webapp/Download?colCode=UM10204>`_
		published by NXP Semiconductors. However, you need to log-in to the site to
		access the PDF. An older version of the specification (revision 6) is archived
		`here <https://web.archive.org/web/20210813122132/https://www.nxp.com/docs/en/user-guide/UM10204.pdf>`_.

		SMBus (System Management Bus) is based on the I2C protocol, and is mostly
		a subset of I2C protocols and signaling. Many I2C devices will work on an

drivers/i2c/i2c-dev.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -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;