]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
nvmet-tcp: handle ICReq PDU received in NVMET_TCP_Q_LIVE state
authorVarun Prakash <varun@chelsio.com>
Tue, 20 Sep 2022 18:34:44 +0000 (00:04 +0530)
committerChristoph Hellwig <hch@lst.de>
Tue, 27 Sep 2022 07:22:08 +0000 (09:22 +0200)
As per NVMe/TCP transport specification ICReq PDU is the first PDU received
by the controller and controller should receive only one ICReq PDU.

If controller receives more than one ICReq PDU then this can be considered
as fatal error.

nvmet-tcp driver does not check for ICReq PDU opcode if queue state is
NVMET_TCP_Q_LIVE. In LIVE state ICReq PDU is treated as CapsuleCmd PDU,
this can result in abnormal behavior.

Add a check for ICReq PDU in nvmet_tcp_done_recv_pdu() to fix this issue.

Signed-off-by: Varun Prakash <varun@chelsio.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/nvme/target/tcp.c

index 70baeab6af30a6e810bbe8e250289d6b4d4fa1fa..1762e2e905853fd071ca091cac8ddedab3c11e63 100644 (file)
@@ -961,6 +961,13 @@ static int nvmet_tcp_done_recv_pdu(struct nvmet_tcp_queue *queue)
                return nvmet_tcp_handle_icreq(queue);
        }
 
+       if (unlikely(hdr->type == nvme_tcp_icreq)) {
+               pr_err("queue %d: received icreq pdu in state %d\n",
+                       queue->idx, queue->state);
+               nvmet_tcp_fatal_error(queue);
+               return -EPROTO;
+       }
+
        if (hdr->type == nvme_tcp_h2c_data) {
                ret = nvmet_tcp_handle_h2c_data_pdu(queue);
                if (unlikely(ret))