Commit 8881a215 authored by Maurizio Lombardi's avatar Maurizio Lombardi Committed by Wenyu Huang
Browse files

nvmet-tcp: Fix the H2C expected PDU len calculation 

stable inclusion
from stable-v5.10.214
commit 0de2e62067d2a6733a5b8ca24066d9bbdfefaf47
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I93ED1
CVE: CVE-2023-52454

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.10.y&id=0de2e62067d2a6733a5b8ca24066d9bbdfefaf47



--------------------------------

[ Upstream commit 9a1abc24850eb759e36a2f8869161c3b7254c904 ]

The nvmet_tcp_handle_h2c_data_pdu() function should take into
consideration the possibility that the header digest and/or the data
digests are enabled when calculating the expected PDU length, before
comparing it to the value stored in cmd->pdu_len.

Fixes: efa56305908b ("nvmet-tcp: Fix a kernel panic when host sends an invalid H2C PDU length")
Signed-off-by: default avatarMaurizio Lombardi <mlombard@redhat.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWenyu Huang <huangwenyu5@huawei.com>
parent ac153a69

drivers/nvme/target/tcp.c

+7 −3
Original line number Diff line number Diff line
@@ -919,7 +919,7 @@ static int nvmet_tcp_handle_h2c_data_pdu(struct nvmet_tcp_queue *queue) 
{

	struct nvme_tcp_data_pdu *data = &queue->pdu.data;

	struct nvmet_tcp_cmd *cmd;

	unsigned int plen;

	unsigned int exp_data_len;



	if (likely(queue->nr_cmds)) {

		if (unlikely(data->ttag >= queue->nr_cmds)) {
@@ -943,9 +943,13 @@ static int nvmet_tcp_handle_h2c_data_pdu(struct nvmet_tcp_queue *queue) 
		return -EPROTO;

	}



	plen = le32_to_cpu(data->hdr.plen);

	exp_data_len = le32_to_cpu(data->hdr.plen) -

			nvmet_tcp_hdgst_len(queue) -

			nvmet_tcp_ddgst_len(queue) -

			sizeof(*data);



	cmd->pdu_len = le32_to_cpu(data->data_length);

	if (unlikely(cmd->pdu_len != (plen - sizeof(*data)) ||

	if (unlikely(cmd->pdu_len != exp_data_len ||

		     cmd->pdu_len == 0 ||

		     cmd->pdu_len > NVMET_TCP_MAXH2CDATA)) {

		pr_err("H2CData PDU len %u is invalid\n", cmd->pdu_len);