Skip to content

Commit 32b63ac

Browse files
shivam-2315keithbusch
authored andcommitted
nvme-tcp: fix NULL pointer dereferences in nvmet_tcp_build_pdu_iovec
Commit efa5630 ("nvmet-tcp: Fix a kernel panic when host sends an invalid H2C PDU length") added ttag bounds checking and data_offset validation in nvmet_tcp_handle_h2c_data_pdu(), but it did not validate whether the command's data structures (cmd->req.sg and cmd->iov) have been properly initialized before processing H2C_DATA PDUs. The nvmet_tcp_build_pdu_iovec() function dereferences these pointers without NULL checks. This can be triggered by sending H2C_DATA PDU immediately after the ICREQ/ICRESP handshake, before sending a CONNECT command or NVMe write command. Attack vectors that trigger NULL pointer dereferences: 1. H2C_DATA PDU sent before CONNECT → both pointers NULL 2. H2C_DATA PDU for READ command → cmd->req.sg allocated, cmd->iov NULL 3. H2C_DATA PDU for uninitialized command slot → both pointers NULL The fix validates both cmd->req.sg and cmd->iov before calling nvmet_tcp_build_pdu_iovec(). Both checks are required because: - Uninitialized commands: both NULL - READ commands: cmd->req.sg allocated, cmd->iov NULL - WRITE commands: both allocated Fixes: efa5630 ("nvmet-tcp: Fix a kernel panic when host sends an invalid H2C PDU length") Reviewed-by: Sagi Grimberg <sagi@grimberg.me> Signed-off-by: Shivam Kumar <kumar.shivam43666@gmail.com> Signed-off-by: Keith Busch <kbusch@kernel.org>
1 parent 340f4fc commit 32b63ac

1 file changed

Lines changed: 12 additions & 0 deletions

File tree

drivers/nvme/target/tcp.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -982,6 +982,18 @@ static int nvmet_tcp_handle_h2c_data_pdu(struct nvmet_tcp_queue *queue)
982982
pr_err("H2CData PDU len %u is invalid\n", cmd->pdu_len);
983983
goto err_proto;
984984
}
985+
/*
986+
* Ensure command data structures are initialized. We must check both
987+
* cmd->req.sg and cmd->iov because they can have different NULL states:
988+
* - Uninitialized commands: both NULL
989+
* - READ commands: cmd->req.sg allocated, cmd->iov NULL
990+
* - WRITE commands: both allocated
991+
*/
992+
if (unlikely(!cmd->req.sg || !cmd->iov)) {
993+
pr_err("queue %d: H2CData PDU received for invalid command state (ttag %u)\n",
994+
queue->idx, data->ttag);
995+
goto err_proto;
996+
}
985997
cmd->pdu_recv = 0;
986998
nvmet_tcp_build_pdu_iovec(cmd);
987999
queue->cmd = cmd;

0 commit comments

Comments
 (0)