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 2CCB14E4C3A; Fri, 9 Oct 2026 14:29:41 +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=1791556183; cv=none; b=tE/ot+vdpnhRfi4tnubjTqraZU3hefvHp/5AXd/obuk9YbgkAAAOCxwObxxfuTYpxOvi79XSNx3vdbGqe9gpDgjeGkpD9LKRgYz8dUEwi1begF1uLFvGr9OyjXUSktZ7yxk460i3Ieb7ywYRyedXRzqogbIrXhgFIjBVlYyQlC4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791556183; c=relaxed/simple; bh=Y0pok6h+pnZFj2w7T/qCOlyEY3j5rViUwpUPsCaYkVw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZqX2mXhWxXHRjGqPDzh4iWIuYDvmSUYqfGLYHzcUj4uVZyRdwUQElC4o+3jmiHjnG4Olktsr07QPpiiZL07UMEHeoYa3HctVTzNlzTv7QiYgosaL8hXLQ7VM4bmsg13Xg7eMZr506hta64yUvk81T/jM2T9DiDY8NNpvitoB9K4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=P/ylOLyM; 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="P/ylOLyM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 274691F00893; Fri, 9 Oct 2026 14:29:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1791556181; bh=CMDI2wa44VUajhCX/5ZDrSJH3RYlj39Ow2bWCvZ3rMk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=P/ylOLyMMByoNlOjLihBC0kigL0y4RLfzGOnslUU8z4CXe5TUHYBS1A8YWcTnlsCb HW5ZpAyrcSHv/+DOfpl9z/Waxnen5DPQ9pQN4Zfx9OadC1/hWrWxUURPvnU9kJYSwK l1P/WEzyqZjRVM7wSplioe+G6DonGYEBEGIIN3HE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable , Heikki Krogerus , Benson Leung , Jameson Thies Subject: [PATCH 6.18 187/403] usb: typec: ucsi: displayport: Current CAM OOB index fixup Date: Fri, 9 Oct 2026 16:09:08 +0200 Message-ID: <20261009140956.496291899@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261009140952.119038291@linuxfoundation.org> References: <20261009140952.119038291@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.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jameson Thies commit ea31c6498c61307dc0d8ce338a7f268cb8cbdd57 upstream. Update ucsi_displayport_enter() to return invalid error when the PPM reports an current alternate mode greater than or equal to UCSI_MAX_ALTMODES. While here, remove 0xff current cam assignment on failed GET_CURRENT_CAM response. Fixes: 04cec690b1fd ("usb: typec: ucsi: displayport: Fix OOB altmode array index") Cc: stable Reviewed-by: Heikki Krogerus Reviewed-by: Benson Leung Signed-off-by: Jameson Thies Link: https://patch.msgid.link/20260917032008.1701888-1-jthies@google.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/typec/ucsi/displayport.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) --- a/drivers/usb/typec/ucsi/displayport.c +++ b/drivers/usb/typec/ucsi/displayport.c @@ -71,11 +71,14 @@ static int ucsi_displayport_enter(struct if (ret < 0) { if (ucsi->version > 0x0100) goto err_unlock; - cur = 0xff; } - if (cur < UCSI_MAX_ALTMODES) { - ret = dp->con->port_altmode[cur] == alt ? 0 : -EBUSY; + if (cur != 0xff) { + if (cur < UCSI_MAX_ALTMODES) + ret = dp->con->port_altmode[cur] == alt ? 0 : -EBUSY; + else + ret = -EINVAL; + goto err_unlock; }