From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 29DD5478E2B; Tue, 16 Jun 2026 17:25:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781630741; cv=none; b=bYkKH+rFKFXJBUIJ6O9kHKZeAoNCkgL0s4Fuxtv6z5SVkTfcURz3+vZuyCrSlnjJ2DfnisFpDkFKDsx7Oc6PDmGznsvjG0k7SM5vodHWs+T0MjFTnAeRoeH5QkoMdVkyHMOJ4th/CcRsezAam5ipp6RW43n938OgBRqP/F3UFLU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781630741; c=relaxed/simple; bh=oIUUgpJvKdpgRJaHnfYqHBhgCxASJCLtvFfhgqIXyrs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D6bocCfUbXEK5XNKv0L2t1saZdgTervSIJzE96f23ymrslQODkIVuN0fw1Dr/dMxQarBuaAXbLYKVRXCYxjMd3rod/XB5LH+N/vWnKiUS7JpAwci4PurDh2nkarhLL/3n3Ubi64p1qJ/yXI//Vn1wCkDyKWqSp8EDc2tha2Vbnc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=EZrl3ejQ; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="EZrl3ejQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 129EB1F000E9; Tue, 16 Jun 2026 17:25:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781630740; bh=XSHjMb/9+DOWLwBDRaCDRLlAcE9qz+tUPBdm5+ip1fo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=EZrl3ejQOkHbhLoNGEO4L0ASaxszezok8H0adQ3X/h58hvuqWawY9gwfq2XgqZP/e 3EOQuNtCPoRnr5fydsb6POho4g3HEqMUaueOJSL1/6bz0JbubNyag3mVOO2BuryR6N 35MuCEUvu+ILEgxnwWW49RNDKm8xVT8xKlDqWxJU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Heikki Krogerus , Benson Leung , Jameson Thies , Nathan Rebello , Johan Hovold , Pooja Katiyar , Hsin-Te Yuan , Abel Vesa , stable , Abel Vesa Subject: [PATCH 6.1 087/522] usb: typec: ucsi: validate connector number in ucsi_connector_change() Date: Tue, 16 Jun 2026 20:23:54 +0530 Message-ID: <20260616145129.943563691@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145125.307082728@linuxfoundation.org> References: <20260616145125.307082728@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Greg Kroah-Hartman commit 288a81a8507052bcfbf884d39a463c44c42c5fd9 upstream. The connector number in a UCSI CCI notification is a 7-bit field supplied by the PPM. ucsi_connector_change() uses it to index the ucsi->connector[] array without checking it against the number of connectors the PPM reported at init time, so a buggy or malicious PPM (EC firmware, or an I2C-attached UCSI controller on the ccg / stm32g0 / glink transports) can drive schedule_work() on memory past the end of the array. Reject connector numbers that are zero or exceed cap.num_connectors before dereferencing the array. Assisted-by: gkh_clanker_t1000 Cc: Heikki Krogerus Cc: Benson Leung Cc: Jameson Thies Cc: Nathan Rebello Cc: Johan Hovold Cc: Pooja Katiyar Cc: Hsin-Te Yuan Cc: Abel Vesa Cc: stable Reviewed-by: Abel Vesa Reviewed-by: Heikki Krogerus Reviewed-by: Benson Leung Link: https://patch.msgid.link/2026051351-truck-steadfast-df48@gregkh Signed-off-by: Greg Kroah-Hartman --- drivers/usb/typec/ucsi/ucsi.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -852,13 +852,22 @@ out_unlock: */ void ucsi_connector_change(struct ucsi *ucsi, u8 num) { - struct ucsi_connector *con = &ucsi->connector[num - 1]; + struct ucsi_connector *con; if (!(ucsi->ntfy & UCSI_ENABLE_NTFY_CONNECTOR_CHANGE)) { dev_dbg(ucsi->dev, "Early connector change event\n"); return; } + if (!num || num > ucsi->cap.num_connectors) { + dev_warn_ratelimited(ucsi->dev, + "Bogus connector change on %u (max %u)\n", + num, ucsi->cap.num_connectors); + return; + } + + con = &ucsi->connector[num - 1]; + if (!test_and_set_bit(EVENT_PENDING, &ucsi->flags)) schedule_work(&con->work); }