43 lines
1.7 KiB
Diff
43 lines
1.7 KiB
Diff
|
From 3abff2e277d590cd59941672278bbc3c94a8b90d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Zhang Jiao <zhangjiao2_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Mon, 21 Oct 2024 14:48:25 +0800
|
||
|
|
Subject: [PATCH] block/nvme: nvme_process_completion() fix bound for cid
|
||
|
|
|
||
|
|
cheery-pick from cc8fb0c3ae3c950eb40e969607e17ff16a7519ac
|
||
|
|
|
||
|
|
NVMeQueuePair::reqs has length NVME_NUM_REQS, which less than
|
||
|
|
NVME_QUEUE_SIZE by 1.
|
||
|
|
|
||
|
|
Fixes: 1086e95da17050 ("block/nvme: switch to a NVMeRequest freelist")
|
||
|
|
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
|
||
|
|
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||
|
|
Reviewed-by: Maksim Davydov <davydov-max@yandex-team.ru>
|
||
|
|
Message-id: 20231017125941.810461-5-vsementsov@yandex-team.ru
|
||
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
||
|
|
Signed-off-by: Zhang Jiao <zhangjiao2_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
block/nvme.c | 7 ++++---
|
||
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/block/nvme.c b/block/nvme.c
|
||
|
|
index fa360b9b3c..d8f4b04e19 100644
|
||
|
|
--- a/block/nvme.c
|
||
|
|
+++ b/block/nvme.c
|
||
|
|
@@ -410,9 +410,10 @@ static bool nvme_process_completion(NVMeQueuePair *q)
|
||
|
|
q->cq_phase = !q->cq_phase;
|
||
|
|
}
|
||
|
|
cid = le16_to_cpu(c->cid);
|
||
|
|
- if (cid == 0 || cid > NVME_QUEUE_SIZE) {
|
||
|
|
- warn_report("NVMe: Unexpected CID in completion queue: %"PRIu32", "
|
||
|
|
- "queue size: %u", cid, NVME_QUEUE_SIZE);
|
||
|
|
+ if (cid == 0 || cid > NVME_NUM_REQS) {
|
||
|
|
+ warn_report("NVMe: Unexpected CID in completion queue: %" PRIu32
|
||
|
|
+ ", should be within: 1..%u inclusively", cid,
|
||
|
|
+ NVME_NUM_REQS);
|
||
|
|
continue;
|
||
|
|
}
|
||
|
|
trace_nvme_complete_command(s, q->index, cid);
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|