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=1795053690; b=ug8Tj1Bvzm9QELlUEVIAxgpMCSKgsXs24sNZ1UnSgZGQm1eNz+qeF0Zu3E8qK2WYKarF qXIVTtwB5tCoPGcBK6Z1pKfOHoJzBuWL/TGdbwJ94fHCDfZt/CP2zq3BovNAtakGJF3DC /gCwW4b0/+MelIsg7j5GPIxttTS38k5isX1SC+jx8PFsjmOxBL/46u3KDU/odOrDoVbwX c7rchb7B4DfpmQdUnnvaQenR750wdGvegR+QZ8wyfNk0Kohu5Zeh6NzVAHRr1gmgGznPQ MQNo881bWkZpAVcupszztFUSR7QfA7YYE2PmmZJYbrFVbJEYv9yfYMWBGhobx/iweng== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795053690; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=Vd7RL7QE8JL6EmasxPum1zNPPwYpxBhEakR63ZM4qus=; b=rM2m9sQRaYylYfr54CVwdjeWw+T0M5WUA37TX8caLlI24+8xmtL086+RrP/Sy/1/THHs UdVRJR1BJRdAp3XSRUMVgY8f4VJduSk/vYcN7KArIrOPJUn8DIxA5G3yUamwykE18W8FI CDjZMlKm4j8LsxCB9tpfiIthb5CkeB4hG49ZILKauaW9MEblr6xwTjDBIQNLnI/ZWlF0r goX6hLADvgJ8w9NQ+zK7CIbGBobaCwA9tiJaIIt+Mcd7pnmjfEetkdKbjE+hdiuPyuelQ TvDrSMrX533qszJ8E4lsOJwCSfJjwZJCujmF04E+GNFmhIs+h0NybXStoFla14eGcMg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=hCa6QPhm; 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 48936606A32C; Thu, 19 Nov 2026 02:01:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=hCa6QPhm Received: by smtp.kernel.org (Postfix) with ESMTPSA id 85B471F000C4; Thu, 19 Nov 2026 02:01:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795053690; bh=Vd7RL7QE8JL6EmasxPum1zNPPwYpxBhEakR63ZM4qus=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hCa6QPhmiGRYByFXOjZFAKwL/4JSigao+EAnzzAQBKdKvo6gDmKDegmiLmKYQaS8s oFOeyKiyxvl5IQ8jx6yy5PSapKL1P8ZaCBnOpie+nw3p6K0tLNB/k0cfhmxwdlpf6v CuekrX7WSUoF4yq69FpBkl+O4wZgRqc7oeZBtEW8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable , Nathan Rebello , Seungjin Bae , Heikki Krogerus , Sasha Levin Subject: [PATCH 5.15 1007/2214] usb: typec: ucsi: ccg: Validate altmode index in GET_CURRENT_CAM response Date: Wed, 18 Nov 2026 15:44:43 +0100 Message-ID: <20261118150052.678562746@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Seungjin Bae [ Upstream commit 02ee864e8d2142c5648998944c3306ea6a763c26 ] 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 [ sashal: adapted GET_CURRENT_CAM error handling to ucsi_ccg_read() without the upstream CCI status checks ] Signed-off-by: Sasha Levin --- drivers/usb/typec/ucsi/ucsi_ccg.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/usb/typec/ucsi/ucsi_ccg.c b/drivers/usb/typec/ucsi/ucsi_ccg.c index b50933cd4babf..2caef7d02cbb6 100644 --- a/drivers/usb/typec/ucsi/ucsi_ccg.c +++ b/drivers/usb/typec/ucsi/ucsi_ccg.c @@ -351,14 +351,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, @@ -541,7 +555,7 @@ static int ucsi_ccg_read(struct ucsi *ucsi, unsigned int offset, switch (UCSI_COMMAND(uc->last_cmd_sent)) { case UCSI_GET_CURRENT_CAM: if (uc->has_multiple_dp) - ucsi_ccg_update_get_current_cam_cmd(uc, (u8 *)val); + ret = ucsi_ccg_update_get_current_cam_cmd(uc, (u8 *)val); break; case UCSI_GET_ALTERNATE_MODES: if (UCSI_ALTMODE_RECIPIENT(uc->last_cmd_sent) == -- 2.53.0