Skip to content

Commit 16a121c

Browse files
author
CKI KWF Bot
committed
Merge: CVE-2025-38264: nvme-tcp: sanitize request list handling
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1192 JIRA: https://issues.redhat.com/browse/RHEL-103236 CVE: CVE-2025-38264 ``` commit 0bf04c8 Author: Hannes Reinecke <hare@kernel.org> Date: Wed May 28 08:45:33 2025 +0200 nvme-tcp: sanitize request list handling Validate the request in nvme_tcp_handle_r2t() to ensure it's not part of any list, otherwise a malicious R2T PDU might inject a loop in request list processing. Signed-off-by: Hannes Reinecke <hare@kernel.org> Reviewed-by: Sagi Grimberg <sagi@grimberg.me> Signed-off-by: Christoph Hellwig <hch@lst.de> ``` Signed-off-by: CKI Backport Bot <cki-ci-bot+cki-gitlab-backport-bot@redhat.com> --- <small>Created 2025-07-11 22:02 UTC by backporter - [KWF FAQ](https://red.ht/kernel_workflow_doc) - [Slack #team-kernel-workflow](https://redhat-internal.slack.com/archives/C04LRUPMJQ5) - [Source](https://gitlab.com/cki-project/kernel-workflow/-/blob/main/webhook/utils/backporter.py) - [Documentation](https://gitlab.com/cki-project/kernel-workflow/-/blob/main/docs/README.backporter.md) - [Report an issue](https://issues.redhat.com/secure/CreateIssueDetails!init.jspa?pid=12334433&issuetype=1&priority=4&summary=backporter+webhook+issue&components=kernel-workflow+/+backporter)</small> Approved-by: John Meneghini <jmeneghi@redhat.com> Approved-by: Chris Leech <cleech@redhat.com> Approved-by: Ewan D. Milne <emilne@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
2 parents b470209 + 53a7ba8 commit 16a121c

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

drivers/nvme/host/tcp.c

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,8 @@ nvme_tcp_fetch_request(struct nvme_tcp_queue *queue)
453453
return NULL;
454454
}
455455

456-
list_del(&req->entry);
456+
list_del_init(&req->entry);
457+
init_llist_node(&req->lentry);
457458
return req;
458459
}
459460

@@ -561,6 +562,8 @@ static int nvme_tcp_init_request(struct blk_mq_tag_set *set,
561562
req->queue = queue;
562563
nvme_req(rq)->ctrl = &ctrl->ctrl;
563564
nvme_req(rq)->cmd = &pdu->cmd;
565+
init_llist_node(&req->lentry);
566+
INIT_LIST_HEAD(&req->entry);
564567

565568
return 0;
566569
}
@@ -765,6 +768,14 @@ static int nvme_tcp_handle_r2t(struct nvme_tcp_queue *queue,
765768
return -EPROTO;
766769
}
767770

771+
if (llist_on_list(&req->lentry) ||
772+
!list_empty(&req->entry)) {
773+
dev_err(queue->ctrl->ctrl.device,
774+
"req %d unexpected r2t while processing request\n",
775+
rq->tag);
776+
return -EPROTO;
777+
}
778+
768779
req->pdu_len = 0;
769780
req->h2cdata_left = r2t_length;
770781
req->h2cdata_offset = r2t_offset;
@@ -2583,6 +2594,8 @@ static void nvme_tcp_submit_async_event(struct nvme_ctrl *arg)
25832594
ctrl->async_req.offset = 0;
25842595
ctrl->async_req.curr_bio = NULL;
25852596
ctrl->async_req.data_len = 0;
2597+
init_llist_node(&ctrl->async_req.lentry);
2598+
INIT_LIST_HEAD(&ctrl->async_req.entry);
25862599

25872600
nvme_tcp_queue_request(&ctrl->async_req, true, true);
25882601
}

0 commit comments

Comments
 (0)