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 181423161A1; Sat, 12 Sep 2026 13:52:57 +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=1789221178; cv=none; b=sACbBqPDEzsEI11TlnnP+rJa2JCZmpzECJJk1hxq3s+SjYuIIGPt+es+8waZ53ft6xJyILsYt1NjWrEzZTl8owo9bTBFd9D4fptdHlH2C2UMysH6Q0n95yl2S+K5YEyKecqeoXIIvRADP84AtPIUbOzufPrCfYKFvqWgpBCgjIs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789221178; c=relaxed/simple; bh=rK/QAICH60OSprdB5SS6CIJLByBYd/eAHG9UEmcSTvU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rzTuL7udKuNUgIyo6uMhkse1qFxJvTwdLGB5JZYXMCALIechwXxjCbJ6K/JFucIRUoK00f1vjyZ4OKO3omjXi2mMfXpR0B93qguGSYBRVbkI7rhMLQ9tmEgx38lTMT8FW/KNUAQFYiyKH3sjkFeTNfagkmNJ0ZNxO3YXL0ZVef4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=HUJMhdZO; 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="HUJMhdZO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DEDDA1F000FF; Sat, 12 Sep 2026 13:52:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789221177; bh=BnNO3Oo3LojKBEJMSz6hwKjsH8YxxddqnYeVR1h5tiQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=HUJMhdZOrEAOL7/gsvQErEX6/+8zUk+qBG9vw4NJGaBRHuk/ZCxNw2WWb/SAtK4af mactj2Ez/4KNfnApVhCE73wwhAhXjEU3iylzT1ulZMuB2fUgn37PKp35GvX8XghGWB IVgm6jqG5vkZ0KHZwdyGc5346g/UVzvwwif2eGs8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jameson Thies , Benson Leung Subject: [PATCH 6.6 0329/1424] usb: typec: ucsi: displayport: Fix OOB altmode array index Date: Sat, 12 Sep 2026 08:46:01 +0200 Message-ID: <20260912065614.654491922@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065607.279695368@linuxfoundation.org> References: <20260912065607.279695368@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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jameson Thies commit 04cec690b1fd9d1c4c314b91a10d8c68a3acfe18 upstream. The UCSI displayport driver indexes the connector's port altmode array with the GET_CURRENT_CAM response after checking it is not 0xff. The port altmode array is UCSI_MAX_ALTMODES elements long. If the PPM returns an invalid GET_CURRENT_CAM response above UCSI_MAX_ALTMODES and not equal to 0xff, the kernel may crash with an array index OOB error. Update the UCSI displayport driver to verify the current cam is less than UCSI_MAX_ALTMODES before accessing the port altmode array. Fixes: af8622f6a585 ("usb: typec: ucsi: Support for DisplayPort alt mode") Cc: stable@vger.kernel.org Signed-off-by: Jameson Thies Reviewed-by: Benson Leung Link: https://patch.msgid.link/20260825234545.2076049-1-jthies@google.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/typec/ucsi/displayport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/usb/typec/ucsi/displayport.c +++ b/drivers/usb/typec/ucsi/displayport.c @@ -74,7 +74,7 @@ static int ucsi_displayport_enter(struct cur = 0xff; } - if (cur != 0xff) { + if (cur < UCSI_MAX_ALTMODES) { ret = dp->con->port_altmode[cur] == alt ? 0 : -EBUSY; goto err_unlock; }