[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 13/18] hw/block/nvme: make sure ncqr and nsqr is valid
From: |
Klaus Jensen |
Subject: |
[PATCH v2 13/18] hw/block/nvme: make sure ncqr and nsqr is valid |
Date: |
Fri, 3 Jul 2020 08:34:15 +0200 |
From: Klaus Jensen <k.jensen@samsung.com>
0xffff is not an allowed value for NCQR and NSQR in Set Features on
Number of Queues.
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Acked-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Dmitry Fomichev <dmitry.fomichev@wdc.com>
---
hw/block/nvme.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index 9cff0f45dd7e..8230e0e3826b 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -1256,6 +1256,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_pci_nvme_setfeat_numq((dw11 & 0xFFFF) + 1,
((dw11 >> 16) & 0xFFFF) + 1,
n->params.max_ioqpairs,
--
2.27.0
- [PATCH v2 08/18] hw/block/nvme: move NvmeFeatureVal into hw/block/nvme.h, (continued)
- [PATCH v2 08/18] hw/block/nvme: move NvmeFeatureVal into hw/block/nvme.h, Klaus Jensen, 2020/07/03
- [PATCH v2 03/18] hw/block/nvme: add support for the abort command, Klaus Jensen, 2020/07/03
- [PATCH v2 05/18] hw/block/nvme: mark fw slot 1 as read-only, Klaus Jensen, 2020/07/03
- [PATCH v2 06/18] hw/block/nvme: add support for the get log page command, Klaus Jensen, 2020/07/03
- [PATCH v2 07/18] hw/block/nvme: add support for the asynchronous event request command, Klaus Jensen, 2020/07/03
- [PATCH v2 10/18] hw/block/nvme: fix missing endian conversion, Klaus Jensen, 2020/07/03
- [PATCH v2 12/18] hw/block/nvme: support the get/set features select and save fields, Klaus Jensen, 2020/07/03
- [PATCH v2 09/18] hw/block/nvme: flush write cache when disabled, Klaus Jensen, 2020/07/03
- [PATCH v2 13/18] hw/block/nvme: make sure ncqr and nsqr is valid,
Klaus Jensen <=
- [PATCH v2 14/18] hw/block/nvme: support identify namespace descriptor list, Klaus Jensen, 2020/07/03
- [PATCH v2 11/18] hw/block/nvme: add remaining mandatory controller parameters, Klaus Jensen, 2020/07/03