lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 830/862] nvmet-tcp: add bounds check on Transfer Tag
    Date
    From: Varun Prakash <varun@chelsio.com>

    [ 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 | 11 +++++++++--
    1 file changed, 9 insertions(+), 2 deletions(-)

    diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c
    index a3694a32f6d5..7dcf88cde189 100644
    --- a/drivers/nvme/target/tcp.c
    +++ b/drivers/nvme/target/tcp.c
    @@ -935,10 +935,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",
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-19 11:43    [W:4.017 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site