qemu: Fix memory leak in virQEMUCapsLoadCPUModels

[libvirt] [PATCH] qemu: Fix memory leak in virQEMUCapsLoadCPUModels

Posted by Marc Hartmayer 7 years, 6 months ago

Don't leak @blockNodes in the loop.

==226576== 7,120 bytes in 60 blocks are definitely lost in loss record 122 of 125
==226576==    at 0x4835214: calloc (vg_replace_malloc.c:711)
==226576==    by 0x4950D7B: virAllocN (viralloc.c:191)
==226576==    by 0x49EB5BB: virXPathNodeSet (virxml.c:676)
==226576==    by 0x104DB67: virQEMUCapsLoadCPUModels (qemu_capabilities.c:3738)
==226576==    by 0x105510D: virQEMUCapsLoadCache (qemu_capabilities.c:3929)
==226576==    by 0x104459F: qemuTestParseCapabilities (testutilsqemu.c:498)
==226576==    by 0x1040DC9: testQemuCapsCopy (qemucapabilitiestest.c:105)
==226576==    by 0x1041F07: virTestRun (testutils.c:180)
==226576==    by 0x1040B45: mymain (qemucapabilitiestest.c:181)
==226576==    by 0x104320F: virTestMain (testutils.c:1119)
==226576==    by 0x1041149: main (qemucapabilitiestest.c:193)

Signed-off-by: Marc Hartmayer <mhartmay@linux.vnet.ibm.com>
Reviewed-by: Bjoern Walk <bwalk@linux.vnet.ibm.com>
Reviewed-by: Boris Fiuczynski <fiuczy@linux.vnet.ibm.com>
---
 src/qemu/qemu_capabilities.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 6cea1ccfa50b..7cb091056b48 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3758,6 +3758,7 @@ virQEMUCapsLoadCPUModels(virQEMUCapsPtr qemuCaps,
                     goto cleanup;
                 }
             }
+            VIR_FREE(blockerNodes);
         }
 
         if (virDomainCapsCPUModelsAddSteal(cpus, &str, usable, &blockers) < 0)
-- 
2.5.5

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] qemu: Fix memory leak in virQEMUCapsLoadCPUModels

Posted by Jiri Denemark 7 years, 6 months ago

On Fri, Oct 27, 2017 at 09:53:03 +0200, Marc Hartmayer wrote:
> Don't leak @blockNodes in the loop.
> 
> ==226576== 7,120 bytes in 60 blocks are definitely lost in loss record 122 of 125
> ==226576==    at 0x4835214: calloc (vg_replace_malloc.c:711)
> ==226576==    by 0x4950D7B: virAllocN (viralloc.c:191)
> ==226576==    by 0x49EB5BB: virXPathNodeSet (virxml.c:676)
> ==226576==    by 0x104DB67: virQEMUCapsLoadCPUModels (qemu_capabilities.c:3738)
> ==226576==    by 0x105510D: virQEMUCapsLoadCache (qemu_capabilities.c:3929)
> ==226576==    by 0x104459F: qemuTestParseCapabilities (testutilsqemu.c:498)
> ==226576==    by 0x1040DC9: testQemuCapsCopy (qemucapabilitiestest.c:105)
> ==226576==    by 0x1041F07: virTestRun (testutils.c:180)
> ==226576==    by 0x1040B45: mymain (qemucapabilitiestest.c:181)
> ==226576==    by 0x104320F: virTestMain (testutils.c:1119)
> ==226576==    by 0x1041149: main (qemucapabilitiestest.c:193)
> 
> Signed-off-by: Marc Hartmayer <mhartmay@linux.vnet.ibm.com>
> Reviewed-by: Bjoern Walk <bwalk@linux.vnet.ibm.com>
> Reviewed-by: Boris Fiuczynski <fiuczy@linux.vnet.ibm.com>
> ---
>  src/qemu/qemu_capabilities.c | 1 +
>  1 file changed, 1 insertion(+)

ACK and pushed.

Jirka

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list