[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/15] hw/block/nvme: fix null ns in register namespace
From: |
Max Reitz |
Subject: |
[PULL 04/15] hw/block/nvme: fix null ns in register namespace |
Date: |
Mon, 9 Nov 2020 18:38:28 +0100 |
From: Klaus Jensen <k.jensen@samsung.com>
Fix dereference after NULL check.
Reported-by: Coverity (CID 1436128)
Fixes: b20804946bce ("hw/block/nvme: update nsid when registered")
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Message-Id: <20201104102248.32168-2-its@irrelevant.dk>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
hw/block/nvme.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index fa2cba744b..080d782f1c 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -2562,8 +2562,7 @@ int nvme_register_namespace(NvmeCtrl *n, NvmeNamespace
*ns, Error **errp)
if (!nsid) {
for (int i = 1; i <= n->num_namespaces; i++) {
- NvmeNamespace *ns = nvme_ns(n, i);
- if (!ns) {
+ if (!nvme_ns(n, i)) {
nsid = ns->params.nsid = i;
break;
}
--
2.28.0
- [PULL 00/15] Block patches for 5.2.0-rc1, Max Reitz, 2020/11/09
- [PULL 02/15] block: Move bdrv_drain_all_end_quiesce() to block_int.h, Max Reitz, 2020/11/09
- [PULL 01/15] block: Remove unused include, Max Reitz, 2020/11/09
- [PULL 03/15] qcow2: Document and enforce the QCowL2Meta invariants, Max Reitz, 2020/11/09
- [PULL 05/15] hw/block/nvme: fix uint16_t use of uint32_t sgls member, Max Reitz, 2020/11/09
- [PULL 04/15] hw/block/nvme: fix null ns in register namespace,
Max Reitz <=
- [PULL 06/15] hw/block/nvme: fix free of array-typed value, Max Reitz, 2020/11/09
- [PULL 10/15] block: enable libnfs on msys2/mingw in cirrus.yml, Max Reitz, 2020/11/09
- [PULL 07/15] iotests: add filter_qmp_virtio_scsi function, Max Reitz, 2020/11/09
- [PULL 08/15] iotests: rewrite iotest 240 in python, Max Reitz, 2020/11/09
- [PULL 11/15] block: Fix integer promotion error in bdrv_getlength(), Max Reitz, 2020/11/09
- [PULL 12/15] block: Fix some code style problems, "foo* bar" should be "foo *bar", Max Reitz, 2020/11/09
- [PULL 13/15] block: add forgotten bdrv_abort_perm_update() to bdrv_co_invalidate_cache(), Max Reitz, 2020/11/09
- [PULL 14/15] block: add bdrv_replace_node_common(), Max Reitz, 2020/11/09
- [PULL 09/15] block: Fixes nfs compiling error on msys2/mingw, Max Reitz, 2020/11/09
- [PULL 15/15] block: make bdrv_drop_intermediate() less wrong, Max Reitz, 2020/11/09