Skip to contentSkip to conversation

nvme: fix cmbuf leak on exit

PATCH In review Stefan Hajnoczi 2 participants 2 messages Sep 19, 2017

lore
Share & tools
lore

Stefan Hajnoczi

author
#0 lore raw

PATCH 1/1 nvme: fix cmbuf leak on exit

Cc Keith Busch <[email protected]>
Signed-off-by Stefan Hajnoczi <[email protected]>
---
 hw/block/nvme.c | 1 +
 1 file changed, 1 insertion(+)
hw/block/nvme.c +1 -0
index 9aa32692a3..513ec7065d 100644
@@ -1057,6 +1057,7 @@ static void nvme_exit(PCIDevice *pci_dev)
     g_free(n->namespaces);
     g_free(n->cq);
     g_free(n->sq);
+    g_free(n->cmbuf);
     if (n->cmbsz) {
         memory_region_unref(&n->ctrl_mem);
     }
Signature · 1 line
2.13.5
Reviewed-by on v1 1/1
#1 lore raw

Hi Stefan,

Quoted 11 lines · Stefan Hajnoczi
Cc Keith Busch <[email protected]>
Signed-off-by Stefan Hajnoczi <[email protected]>
---
  hw/block/nvme.c | 1 +
  1 file changed, 1 insertion(+)
hw/block/nvme.c +0 -0
index 9aa32692a3..513ec7065d 100644

hw/block/nvme.c static void nvme_exit(PCIDevice *pci_dev) · line 1060

Quoted 4 lines
hw/block/nvme.c +1 -0
@@ -1057,6 +1057,7 @@ static void nvme_exit(PCIDevice *pci_dev)
      g_free(n->namespaces);
      g_free(n->cq);
      g_free(n->sq);
+    g_free(n->cmbuf);

I'd move it 1 line below,

hw/block/nvme.c static void nvme_exit(PCIDevice *pci_dev) · line 1061

Quoted 1 line
hw/block/nvme.c +0 -0
      if (n->cmbsz) {

here:

            g_free(n->cmbuf);

hw/block/nvme.c static void nvme_exit(PCIDevice *pci_dev) · line 1063

Quoted 3 lines
hw/block/nvme.c +0 -0
          memory_region_unref(&n->ctrl_mem);
      }

Anyway g_free() handles NULL, so:

Reviewed-by Philippe Mathieu-Daudé <[email protected]>