From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794047610; b=aQ/bNqeIGSUe2x1tmLqlHDCg5wPKW2t5yEATA8iLw4JjVUZ2VWs2bCtQRYxcFcYpTJTZ jpvFzDPsXtsMGjfRTc+OslDYpJBQD2U/9BalwyVI00AmptJ+pzVENGXTLTDQtJvEo2bHA qAgJzJhE4UVWl7jUooyzYENtoqO++vxp0O5DgstvplIiOxTFlM5dFwzSVMjfTQ0F6ldc3 lqmzRV5Nrm0/5fLKlHw+9GoR4j/KM2LXsxRXfvGdwmTFaxKrooFhQAa4/4b6rY4N2D176 UETXlhlbRQ0kYgZDMyuVs+K65ggWs26/s9EX/7P7l8RmNVN3eHCW3uJGBY4G+CyVMBQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794047610; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=3v8h0hn8fQ1lkzu80qQb3joHxiwHRIoslA54l4L7neA=; b=KD0HuO7lnMRAZnzJ7yGOzbPXDo2ApBNb9CLAkDAYnytnn1SNd2nQJV0O5iRYpZFUkK9D xa3cvXTgpsfmPz/3eORJLMx0QcX3/Cv4Kk4y9eHTD/xsLDga2li344vtXddgFFKr8vRnB uJ1CkSfr592/NnOKcbsOQy+lOu5ioYCMUXC3otJsqch7gFVaGiZO0hvKHIHd4P/JmYPVy 9cmJ6G34eW25znS2AjHD0HEUHJtMcVKlDzBPuytE/a5dTjZaEj4+2ekZqIUxZCDKf1hhQ v3LRSBvnvUmJKXsrRffB2US/aoJYCD/CJfxWlIsRb3IQUnLzySb6oNfBg+xl9HTQtxQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=c0m2grLE; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9B329606A326 for ; Sat, 7 Nov 2026 10:33:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=c0m2grLE Received: by smtp.kernel.org (Postfix) with ESMTPSA id DB0851F0089F; Sat, 7 Nov 2026 10:33:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794047610; bh=3v8h0hn8fQ1lkzu80qQb3joHxiwHRIoslA54l4L7neA=; h=From:To:Cc:Subject:Date; b=c0m2grLEUj+FMIpWPivkSXimBxQsBWNWxEpzlNHLgtWz09281JCzN1AJiIHBPm5p1 cffn/TSWhbrcCny6gqibcb66velMt9GOPuC/GaZx51tzQ0fsv4J6thFB7tmnbHko4O szz2WIr8za2BC6wBV6yBzG9IOyOJPLRmZZFSYRpg7tEZVDL0ASIEPzF9xpn/ZogFrf XhR5URQbnt9U2U3zGgs+r6pNA9WumBVP3eMsThSop2OjDbedmXHfYpOlJlL3QBny+u coaVEtRYfI/hPXHxxmtHq9CTmva1HGGtoXmPIwZAuckmpcGxftlSKQOTrp4qSuHQBt 2b15hbOk4n3uQ== From: Sasha Levin To: eeodqql09@gmail.com, nathan.c.rebello.27@dartmouth.edu, heikki.krogerus@linux.intel.com, gregkh@linuxfoundation.org Cc: stable@vger.kernel.org Subject: FAILED: patch "[PATCH] usb: typec: ucsi: ccg: Validate altmode index in GET_CURRENT_CAM response" failed to apply to 6.6-stable tree Date: Sat, 7 Nov 2026 05:33:28 -0500 Message-ID: <20261107053328-failed-6.6-02ee864e8d21@kernel.org> X-Mailer: git-send-email 2.53.0 X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.6-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y git checkout FETCH_HEAD git cherry-pick -x 02ee864e8d2142c5648998944c3306ea6a763c26 # git commit -s git send-email --to '' --in-reply-to '20261107053328-failed-6.6-02ee864e8d21@kernel.org' --subject-prefix 'PATCH 6.6.y' 'HEAD^..' Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From 02ee864e8d2142c5648998944c3306ea6a763c26 Mon Sep 17 00:00:00 2001 From: Seungjin Bae Date: Sat, 3 Oct 2026 17:55:20 -0400 Subject: [PATCH] usb: typec: ucsi: ccg: Validate altmode index in GET_CURRENT_CAM response When the PPM reports more than one DisplayPort alternate mode for a connector, ucsi_ccg_update_altmodes() merges them into a single entry in uc->updated[] and sets uc->has_multiple_dp. In that case, ucsi_ccg_update_get_current_cam_cmd() rewrites the response of the GET_CURRENT_CAM command. The response is a single byte holding the index of the currently active alternate mode, and it is provided by the PPM firmware. The function uses this byte directly as an index into uc->orig[], and then uses the linked_idx read from that entry as the translated index into uc->updated[]. Both arrays have UCSI_MAX_ALTMODES entries, but neither index is checked against that size. If a malicious or buggy PPM reports a value of UCSI_MAX_ALTMODES or larger, e.g. 0xFF, uc->orig[cam].linked_idx reads over the end of uc->orig[]. The byte read from there is then used as the index for writing cam into uc->updated[new_cam].active_idx, so the out-of-bounds read is followed by an out-of-bounds write. This happens without any userspace action, since the UCSI core issues GET_CURRENT_CAM on its own when handling connector changes. Fix this by rejecting responses whose index is out of range, printing an error and returning -EPROTO, so that the caller cannot accept this. Also check linked_idx before using it as an index, so that the write into uc->updated[] is always within bounds. The response is now only processed when the command completed without an error. ucsi_sync_control_common() only reads the response when the CCI reports command completion, so otherwise the buffer is not filled and must not be mistaken for an invalid index. This bug was found with a Python script that traces where firmware input is used. Fixes: 170a6726d0e2 ("usb: typec: ucsi: add support for separate DP altmode devices") Cc: stable Reported-by: Nathan Rebello Assisted-by: LLM Signed-off-by: Seungjin Bae Reviewed-by: Heikki Krogerus Link: https://patch.msgid.link/20261003215520.611083-2-eeodqql09@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/typec/ucsi/ucsi_ccg.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/drivers/usb/typec/ucsi/ucsi_ccg.c b/drivers/usb/typec/ucsi/ucsi_ccg.c index 91c2958a708c0..80e3e84b418d7 100644 --- a/drivers/usb/typec/ucsi/ucsi_ccg.c +++ b/drivers/usb/typec/ucsi/ucsi_ccg.c @@ -384,14 +384,28 @@ static int ucsi_ccg_init(struct ucsi_ccg *uc) return -ETIMEDOUT; } -static void ucsi_ccg_update_get_current_cam_cmd(struct ucsi_ccg *uc, u8 *data) +static int ucsi_ccg_update_get_current_cam_cmd(struct ucsi_ccg *uc, u8 *data) { u8 cam, new_cam; cam = data[0]; + if (cam >= UCSI_MAX_ALTMODES) { + dev_err(uc->dev, "PPM returned invalid alternate mode index %u\n", + cam); + return -EPROTO; + } + new_cam = uc->orig[cam].linked_idx; + if (new_cam >= UCSI_MAX_ALTMODES) { + dev_err(uc->dev, "invalid linked alternate mode index %u for %u\n", + new_cam, cam); + return -EPROTO; + } + uc->updated[new_cam].active_idx = cam; data[0] = new_cam; + + return 0; } static bool ucsi_ccg_update_altmodes(struct ucsi *ucsi, @@ -636,8 +650,10 @@ static int ucsi_ccg_sync_control(struct ucsi *ucsi, u64 command, u32 *cci, switch (UCSI_COMMAND(command)) { case UCSI_GET_CURRENT_CAM: - if (uc->has_multiple_dp) - ucsi_ccg_update_get_current_cam_cmd(uc, (u8 *)data); + if (!ret && uc->has_multiple_dp && + (*cci & UCSI_CCI_COMMAND_COMPLETE) && + !(*cci & UCSI_CCI_ERROR)) + ret = ucsi_ccg_update_get_current_cam_cmd(uc, (u8 *)data); break; case UCSI_GET_ALTERNATE_MODES: if (UCSI_ALTMODE_RECIPIENT(command) == UCSI_RECIPIENT_SOP) { -- 2.53.0