devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonas Jelonek <jelonek.jonas@gmail.com>
To: Chris Packham <chris.packham@alliedtelesis.co.nz>,
	Andi Shyti <andi.shyti@kernel.org>, Rob Herring <robh@kernel.org>,
	Krzysztof Kozlowski <krzk+dt@kernel.org>
Cc: linux-i2c@vger.kernel.org, Conor Dooley <conor+dt@kernel.org>,
	devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
	Markus Stockhausen <markus.stockhausen@gmx.de>,
	Sven Eckelmann <sven@narfation.org>,
	Harshal Gohel <hg@simonwunderlich.de>,
	Jonas Jelonek <jelonek.jonas@gmail.com>
Subject: [PATCH v5 05/11] i2c: rtl9300: check if xfer length is valid
Date: Sat,  9 Aug 2025 22:07:06 +0000	[thread overview]
Message-ID: <20250809220713.1038947-6-jelonek.jonas@gmail.com> (raw)
In-Reply-To: <20250809220713.1038947-1-jelonek.jonas@gmail.com>

Add an explicit check for the xfer length to 'rtl9300_i2c_config_xfer'
to make sure a length < 1 or > 16 isn't accepted. While there shouldn't
be a length > 16 because this is specified in the i2c_adapter_quirks, a
length of 0 may be passed. This is problematic, because the code adopts
this value with

(len - 1) & 0xf

because the corresponding register documentation states that the value
in the register is always used + 1 ([1]). Obvious reason for this is to
fit allow xfer length of 16 to be specified in this 4-bit wide register
field.

Another consequence of this is also, that an xfer length of 0 cannot be
set. Thus, an explicit check should avoid this. Before, this actually
led to writing 0xf into the register, probably causing unintended
behaviour.

Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>
---
 drivers/i2c/busses/i2c-rtl9300.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/i2c/busses/i2c-rtl9300.c b/drivers/i2c/busses/i2c-rtl9300.c
index fb1ea2961cfb..35b05fb59f88 100644
--- a/drivers/i2c/busses/i2c-rtl9300.c
+++ b/drivers/i2c/busses/i2c-rtl9300.c
@@ -118,6 +118,9 @@ static int rtl9300_i2c_config_xfer(struct rtl9300_i2c *i2c, struct rtl9300_i2c_c
 {
 	int ret;
 
+	if (len < 1 || len > 16)
+		return -EINVAL;
+
 	ret = regmap_field_write(i2c->fields[F_SCL_FREQ], chan->bus_freq);
 	if (ret)
 		return ret;
-- 
2.48.1


  parent reply	other threads:[~2025-08-09 22:07 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-08-09 22:07 [PATCH v5 00/11] i2c: rework and extend RTL9300 I2C driver Jonas Jelonek
2025-08-09 22:07 ` [PATCH v5 01/11] i2c: rtl9300: use regmap fields and API for registers Jonas Jelonek
2025-08-09 22:07 ` [PATCH v5 02/11] i2c: rtl9300: fix channel number bound check Jonas Jelonek
2025-08-09 22:07 ` [PATCH v5 03/11] dt-bindings: i2c: realtek,rtl9301-i2c: fix wording and typos Jonas Jelonek
2025-08-18 15:10   ` Rob Herring (Arm)
2025-08-09 22:07 ` [PATCH v5 04/11] i2c: rtl9300: rename internal sda_pin to sda_num Jonas Jelonek
2025-08-09 22:07 ` Jonas Jelonek [this message]
2025-08-10  5:51   ` [PATCH v5 05/11] i2c: rtl9300: check if xfer length is valid Wolfram Sang
2025-08-10  7:01     ` Sven Eckelmann
2025-08-10  9:22       ` Jonas Jelonek
2025-08-09 22:07 ` [PATCH v5 06/11] i2c: rtl9300: remove SMBus Quick operation support Jonas Jelonek
2025-08-10  7:13   ` Sven Eckelmann
2025-08-10  9:31     ` Jonas Jelonek
2025-08-09 22:07 ` [PATCH v5 07/11] i2c: rtl9300: move setting SCL frequency to config_io Jonas Jelonek
2025-08-10  8:49   ` Markus Elfring
2025-08-10  8:54     ` Sven Eckelmann
2025-08-10  9:10     ` Jonas Jelonek
2025-08-09 22:07 ` [PATCH v5 08/11] i2c: rtl9300: do not set read mode on every transfer Jonas Jelonek
2025-08-09 22:07 ` [PATCH v5 09/11] i2c: rtl9300: separate xfer configuration and execution Jonas Jelonek
2025-08-09 22:07 ` [PATCH v5 10/11] dt-bindings: i2c: realtek,rtl9301-i2c: extend for RTL9310 support Jonas Jelonek
2025-08-18 15:13   ` Rob Herring (Arm)
2025-08-09 22:07 ` [PATCH v5 11/11] i2c: rtl9300: add support for RTL9310 I2C controller Jonas Jelonek
2025-08-10 10:39   ` Sven Eckelmann

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=20250809220713.1038947-6-jelonek.jonas@gmail.com \
    --to=jelonek.jonas@gmail.com \
    --cc=andi.shyti@kernel.org \
    --cc=chris.packham@alliedtelesis.co.nz \
    --cc=conor+dt@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=hg@simonwunderlich.de \
    --cc=krzk+dt@kernel.org \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=markus.stockhausen@gmx.de \
    --cc=robh@kernel.org \
    --cc=sven@narfation.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).