From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 6CFB02EF2AD; Tue, 17 Jun 2025 16:18:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750177126; cv=none; b=Il0Ay0BEGdwY8VVyfa51nx0f1cvkhB7MutvkLlMp5NcsN5lbbnwY8zjVldTYKwBE689THAsKg9pNU0I7NKkKcSPEvCjIg2OSoEoO2Ly3broFIy9qQEG3OPvpvii0BvUYs0iqZ5uiSY2iauG+wOjKHc/mtsJOWfdcCcigDCyICt0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750177126; c=relaxed/simple; bh=LNqOb85gFdGh5yO++TLRkR0ZfMiw8f/i817NgVmlTlE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VkLgayJqg+hfLXd+hWyMxNz7E6FuAI1hx4+7oiN2yQaLAimyDuGRUX00pcH/3AtyXot1LVqyPB6lmMojxEyuDNiZBlT8e1fh3CJRHazg9Gbi+wJ6GDsmJGvbYibqvZXBpg8zyXrACTUF38v1YaZBzcd7oSUb6aie//odMLmuz5o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=NoUkhRpI; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="NoUkhRpI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 842EDC4CEE3; Tue, 17 Jun 2025 16:18:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750177126; bh=LNqOb85gFdGh5yO++TLRkR0ZfMiw8f/i817NgVmlTlE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NoUkhRpI+WQuZgZw5s6+FEUKl01cxYP6tJUjul+3n1i2fqLCzibKmZeB1roFUdJBw eTrdBouthUvpPURlnd0B6LTmdUluOkyGB6UuT7RC9MnG7pR/18W1S7Kdo+b0cywcV7 IsYXE9OiN3otewrd1VZdtUmnaw85qhfpgRkteg2g= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Amit Sunil Dhamne , Badhri Jagan Sridharan , Kyle Tso , stable , Heikki Krogerus Subject: [PATCH 6.6 350/356] usb: typec: tcpm/tcpci_maxim: Fix bounds check in process_rx() Date: Tue, 17 Jun 2025 17:27:45 +0200 Message-ID: <20250617152352.219722185@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250617152338.212798615@linuxfoundation.org> References: <20250617152338.212798615@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org 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: Amit Sunil Dhamne commit 0736299d090f5c6a1032678705c4bc0a9511a3db upstream. Register read of TCPC_RX_BYTE_CNT returns the total size consisting of: PD message (pending read) size + 1 Byte for Frame Type (SOP*) This is validated against the max PD message (`struct pd_message`) size without accounting for the extra byte for the frame type. Note that the struct pd_message does not contain a field for the frame_type. This results in false negatives when the "PD message (pending read)" is equal to the max PD message size. Fixes: 6f413b559f86 ("usb: typec: tcpci_maxim: Chip level TCPC driver") Signed-off-by: Amit Sunil Dhamne Signed-off-by: Badhri Jagan Sridharan Reviewed-by: Kyle Tso Cc: stable Link: https://lore.kernel.org/stable/20250502-b4-new-fix-pd-rx-count-v1-1-e5711ed09b3d%40google.com Reviewed-by: Heikki Krogerus Link: https://lore.kernel.org/r/20250502-b4-new-fix-pd-rx-count-v1-1-e5711ed09b3d@google.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/typec/tcpm/tcpci_maxim_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/usb/typec/tcpm/tcpci_maxim_core.c +++ b/drivers/usb/typec/tcpm/tcpci_maxim_core.c @@ -145,7 +145,8 @@ static void process_rx(struct max_tcpci_ return; } - if (count > sizeof(struct pd_message) || count + 1 > TCPC_RECEIVE_BUFFER_LEN) { + if (count > sizeof(struct pd_message) + 1 || + count + 1 > TCPC_RECEIVE_BUFFER_LEN) { dev_err(chip->dev, "Invalid TCPC_RX_BYTE_CNT %d\n", count); return; }