OSDN Git Service

hw/block/nvme: fix null ns in register namespace
authorKlaus Jensen <k.jensen@samsung.com>
Wed, 4 Nov 2020 10:22:46 +0000 (11:22 +0100)
committerMax Reitz <mreitz@redhat.com>
Mon, 9 Nov 2020 14:44:21 +0000 (15:44 +0100)
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

index fa2cba7..080d782 100644 (file)
@@ -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;
             }