]> www.infradead.org Git - linux.git/commitdiff
usb: typec: tcpm/tcpci_maxim: Fix bounds check in process_rx()
authorAmit Sunil Dhamne <amitsd@google.com>
Fri, 2 May 2025 23:57:03 +0000 (16:57 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 21 May 2025 11:04:34 +0000 (13:04 +0200)
Register read of TCPC_RX_BYTE_CNT returns the total size consisting of:

  PD message (pending read) size + 1 Byte for Frame Type (SOP*)

This is validated against the max PD message (`struct pd_message`) size
without accounting for the extra byte for the frame type. Note that the
struct pd_message does not contain a field for the frame_type. This
results in false negatives when the "PD message (pending read)" is equal
to the max PD message size.

Fixes: 6f413b559f86 ("usb: typec: tcpci_maxim: Chip level TCPC driver")
Signed-off-by: Amit Sunil Dhamne <amitsd@google.com>
Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
Reviewed-by: Kyle Tso <kyletso@google.com>
Cc: stable <stable@kernel.org>
Link: https://lore.kernel.org/stable/20250502-b4-new-fix-pd-rx-count-v1-1-e5711ed09b3d%40google.com
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20250502-b4-new-fix-pd-rx-count-v1-1-e5711ed09b3d@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/typec/tcpm/tcpci_maxim_core.c

index 29a4aa89d1a143927763c77303a7fe524b7df124..b5a5ed40faea9cfcceef5550263968148646eb44 100644 (file)
@@ -166,7 +166,8 @@ static void process_rx(struct max_tcpci_chip *chip, u16 status)
                return;
        }
 
-       if (count > sizeof(struct pd_message) || count + 1 > TCPC_RECEIVE_BUFFER_LEN) {
+       if (count > sizeof(struct pd_message) + 1 ||
+           count + 1 > TCPC_RECEIVE_BUFFER_LEN) {
                dev_err(chip->dev, "Invalid TCPC_RX_BYTE_CNT %d\n", count);
                return;
        }