]> git.itanic.dy.fi Git - linux-stable/commitdiff
nvmet-tcp: add bounds check on Transfer Tag
authorVarun Prakash <varun@chelsio.com>
Tue, 20 Sep 2022 18:36:49 +0000 (00:06 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 26 Oct 2022 11:22:58 +0000 (13:22 +0200)
[ Upstream commit b6a545ffa2c192b1e6da4a7924edac5ba9f4ea2b ]

ttag is used as an index to get cmd in nvmet_tcp_handle_h2c_data_pdu(),
add a bounds check to avoid out-of-bounds access.

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

index eb5b39c2bba84589c599a82bf0936ffa2e84dc2c..df7a911d303f9c18e33f2f59f1005f51d2af3508 100644 (file)
@@ -858,10 +858,17 @@ 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;
 
-       if (likely(queue->nr_cmds))
+       if (likely(queue->nr_cmds)) {
+               if (unlikely(data->ttag >= queue->nr_cmds)) {
+                       pr_err("queue %d: received out of bound ttag %u, nr_cmds %u\n",
+                               queue->idx, data->ttag, queue->nr_cmds);
+                       nvmet_tcp_fatal_error(queue);
+                       return -EPROTO;
+               }
                cmd = &queue->cmds[data->ttag];
-       else
+       } else {
                cmd = &queue->connect;
+       }
 
        if (le32_to_cpu(data->data_offset) != cmd->rbytes_done) {
                pr_err("ttag %u unexpected data offset %u (expected %u)\n",