[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 16/42] nvme: make sure ncqr and nsqr is valid
From: |
Klaus Jensen |
Subject: |
[PATCH v6 16/42] nvme: make sure ncqr and nsqr is valid |
Date: |
Mon, 16 Mar 2020 07:29:02 -0700 |
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 85c7c86b35f0..e56142c4ea99 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -1155,6 +1155,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.25.1
- Re: [PATCH v6 09/42] nvme: add max_ioqpairs device parameter, (continued)
[PATCH v6 01/42] nvme: rename trace events to nvme_dev, Klaus Jensen, 2020/03/16
[PATCH v6 11/42] nvme: add temperature threshold feature, Klaus Jensen, 2020/03/16
[PATCH v6 16/42] nvme: make sure ncqr and nsqr is valid,
Klaus Jensen <=
[PATCH v6 18/42] nvme: support identify namespace descriptor list, Klaus Jensen, 2020/03/16
[PATCH v6 17/42] nvme: add log specific field to trace events, Klaus Jensen, 2020/03/16
[PATCH v6 12/42] nvme: add support for the get log page command, Klaus Jensen, 2020/03/16