]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
i2c: tiny-usb: disable zero-length read messages
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Thu, 22 May 2025 06:43:49 +0000 (08:43 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 17 Jul 2025 16:27:41 +0000 (18:27 +0200)
commit cbdb25ccf7566eee0c2b945e35cb98baf9ed0aa6 upstream.

This driver passes the length of an i2c_msg directly to
usb_control_msg(). If the message is now a read and of length 0, it
violates the USB protocol and a warning will be printed. Enable the
I2C_AQ_NO_ZERO_LEN_READ quirk for this adapter thus forbidding 0-length
read messages altogether.

Fixes: e8c76eed2ecd ("i2c: New i2c-tiny-usb bus driver")
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Cc: <stable@vger.kernel.org> # v2.6.22+
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
Link: https://lore.kernel.org/r/20250522064349.3823-2-wsa+renesas@sang-engineering.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/i2c/busses/i2c-tiny-usb.c

index d1fa9ff5aeab48f809eb8a928222a5bfb1587a0a..204cc0883da641c211f0668888d4cb014eacda11 100644 (file)
@@ -140,6 +140,11 @@ out:
        return ret;
 }
 
+/* prevent invalid 0-length usb_control_msg */
+static const struct i2c_adapter_quirks usb_quirks = {
+       .flags = I2C_AQ_NO_ZERO_LEN_READ,
+};
+
 /* This is the actual algorithm we define */
 static const struct i2c_algorithm usb_algorithm = {
        .master_xfer    = usb_xfer,
@@ -244,6 +249,7 @@ static int i2c_tiny_usb_probe(struct usb_interface *interface,
        /* setup i2c adapter description */
        dev->adapter.owner = THIS_MODULE;
        dev->adapter.class = I2C_CLASS_HWMON;
+       dev->adapter.quirks = &usb_quirks;
        dev->adapter.algo = &usb_algorithm;
        dev->adapter.algo_data = dev;
        snprintf(dev->adapter.name, sizeof(dev->adapter.name),