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 E3F932D8378; Sun, 7 Jun 2026 10:24:46 +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=1780827887; cv=none; b=XnI2hMikJpf1iRR5vtmjcD8Jh5Erjq6v6k8EjmkOHxooyM31kt/n5XAC4KeLajb/HL3qsW7vEHqGrbGq7HvTAbd8gmYNBb47OdNkwwhrZIlloabHCWR0kaRtTtmi9dV/oWOHbl9RB1qM4ce/JA4QoqhyO+rzFtjlAGIxRQZbWFE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780827887; c=relaxed/simple; bh=QXgwPMhAowzzPiHtqO2cQxPVVrzlWlx2e20FyEa8oeI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nVYnToqpY3SfSwCAG65Y5W54H3vaHmT2I6dSX/g6Jm75N6QABAx+SnuiS5oHgI7ebg0m8EG+K3Xe3BSqwNA02YgqqBcDDdpgryYBKVUx16qzbp1PGubiim7pky1mxvNVbYut6vMyq72Iibzyq3B4pHpDLWVXp9SmYsio/uXpUP8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=pGPd59XF; 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="pGPd59XF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 26CB11F00893; Sun, 7 Jun 2026 10:24:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780827886; bh=Mo2PpxMEEQT3Tg/38JOf/rMbQx43URcwpLG1D620SmU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=pGPd59XFObxk3B6lIcJ75WiThwdW7XreUGocStVT3y8hlBwYtCZ1FIP/Bv7aZFwJE UEqhGJiIpwXzN3lnaty5ur9ZA5WPVVmBuwTdynEWJTZbJb5ckTvtdWjZn42GnFGR8v sMR0LwjuZ4Rsz5rNBS9N2lSG90tLqKcJhDOWeW3U= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Pooja Katiyar , Johan Hovold , stable , Heikki Krogerus Subject: [PATCH 6.18 110/315] usb: typec: ucsi: displayport: NAK DP_CMD_CONFIGURE without a payload VDO Date: Sun, 7 Jun 2026 11:58:17 +0200 Message-ID: <20260607095731.685328900@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260607095727.528828913@linuxfoundation.org> References: <20260607095727.528828913@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: Greg Kroah-Hartman commit 167dd8d12226587ee554f520aed0256b7769cd5d upstream. ucsi_displayport_vdm() handles a DP_CMD_CONFIGURE by copying the first payload VDO from data[], but unlike the equivalent handler in altmodes/displayport.c it does not check that count covers a VDO beyond the header. A header-only Configure VDM (count == 1) would read one u32 past the caller's array. In the normal UCSI path the caller controls count, so this is hardening for non-standard delivery paths. NAK and bail when no configuration VDO is present, matching the generic DP altmode driver's existing guard. Assisted-by: gkh_clanker_t1000 Cc: Pooja Katiyar Cc: Johan Hovold Cc: stable Reviewed-by: Heikki Krogerus Link: https://patch.msgid.link/2026051351-vividly-flattered-eb3d@gregkh Signed-off-by: Greg Kroah-Hartman --- drivers/usb/typec/ucsi/displayport.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/drivers/usb/typec/ucsi/displayport.c +++ b/drivers/usb/typec/ucsi/displayport.c @@ -240,6 +240,10 @@ static int ucsi_displayport_vdm(struct t dp->header |= VDO_CMDT(CMDT_RSP_ACK); break; case DP_CMD_CONFIGURE: + if (count < 2) { + dp->header |= VDO_CMDT(CMDT_RSP_NAK); + break; + } dp->data.conf = *data; if (ucsi_displayport_configure(dp)) { dp->header |= VDO_CMDT(CMDT_RSP_NAK);