[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 17/48] nvme: make sure ncqr and nsqr is valid
From: |
Klaus Jensen |
Subject: |
[PATCH v7 17/48] nvme: make sure ncqr and nsqr is valid |
Date: |
Wed, 15 Apr 2020 07:51:09 +0200 |
From: Klaus Jensen <address@hidden>
0xffff is not an allowed value for NCQR and NSQR in Set Features on
Number of Queues.
Signed-off-by: Klaus Jensen <address@hidden>
Acked-by: Keith Busch <address@hidden>
Reviewed-by: Maxim Levitsky <address@hidden>
---
hw/block/nvme.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index 7094767eeccb..c1e3ae81666a 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -1162,6 +1162,14 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd
*cmd, NvmeRequest *req)
blk_set_enable_write_cache(n->conf.blk, dw11 & 1);
break;
case NVME_NUMBER_OF_QUEUES:
+ /*
+ * NVMe v1.3, Section 5.21.1.7: 0xffff is not an allowed value for NCQR
+ * and NSQR.
+ */
+ if ((dw11 & 0xffff) == 0xffff || ((dw11 >> 16) & 0xffff) == 0xffff) {
+ return NVME_INVALID_FIELD | NVME_DNR;
+ }
+
trace_nvme_dev_setfeat_numq((dw11 & 0xFFFF) + 1,
((dw11 >> 16) & 0xFFFF) + 1,
n->params.max_ioqpairs,
--
2.26.0
- [PATCH v7 11/48] nvme: refactor device realization, (continued)
[PATCH v7 12/48] nvme: add temperature threshold feature, Klaus Jensen, 2020/04/15
[PATCH v7 17/48] nvme: make sure ncqr and nsqr is valid,
Klaus Jensen <=
[PATCH v7 13/48] nvme: add support for the get log page command, Klaus Jensen, 2020/04/15
[PATCH v7 20/48] nvme: enforce valid queue creation sequence, Klaus Jensen, 2020/04/15
[PATCH v7 18/48] nvme: add log specific field to trace events, Klaus Jensen, 2020/04/15
[PATCH v7 15/48] nvme: add missing mandatory features, Klaus Jensen, 2020/04/15
[PATCH v7 16/48] nvme: additional tracing, Klaus Jensen, 2020/04/15
[PATCH v7 19/48] nvme: support identify namespace descriptor list, Klaus Jensen, 2020/04/15
[PATCH v7 14/48] nvme: add support for the asynchronous event request command, Klaus Jensen, 2020/04/15
[PATCH v7 29/48] nvme: add request mapping helper, Klaus Jensen, 2020/04/15
[PATCH v7 38/48] nvme: use preallocated qsg/iov in nvme_dma_prp, Klaus Jensen, 2020/04/15
[PATCH v7 24/48] nvme: add mapping helpers, Klaus Jensen, 2020/04/15