]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
usb: typec: ucsi: skip connector validation before init
authorNathan Rebello <nathan.c.rebello@gmail.com>
Tue, 7 Apr 2026 06:39:58 +0000 (02:39 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 7 Apr 2026 11:35:44 +0000 (13:35 +0200)
Notifications can arrive before ucsi_init() has populated
ucsi->cap.num_connectors via GET_CAPABILITY. At that point
num_connectors is still 0, causing all valid connector numbers to be
incorrectly rejected as bogus.

Skip the bounds check when num_connectors is 0 (not yet initialized).
Pre-init notifications are already handled safely by the early-event
guard in ucsi_connector_change().

Reported-by: Takashi Iwai <tiwai@suse.de>
Fixes: d2d8c17ac01a ("usb: typec: ucsi: validate connector number in ucsi_notify_common()")
Cc: stable@vger.kernel.org
Signed-off-by: Nathan Rebello <nathan.c.rebello@gmail.com>
Tested-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20260407063958.863-1-nathan.c.rebello@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/typec/ucsi/ucsi.c

index 8333bdaf55668de45021c50edbe09ae5884dcb92..46262ee0d1923cd207711a718077794b39277a54 100644 (file)
@@ -44,7 +44,8 @@ void ucsi_notify_common(struct ucsi *ucsi, u32 cci)
                return;
 
        if (UCSI_CCI_CONNECTOR(cci)) {
-               if (UCSI_CCI_CONNECTOR(cci) <= ucsi->cap.num_connectors)
+               if (!ucsi->cap.num_connectors ||
+                   UCSI_CCI_CONNECTOR(cci) <= ucsi->cap.num_connectors)
                        ucsi_connector_change(ucsi, UCSI_CCI_CONNECTOR(cci));
                else
                        dev_err(ucsi->dev, "bogus connector number in CCI: %lu\n",