From 2f2254c7f4e5bff52ea62a77831230bebc076bab Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Tue, 4 Jun 2019 14:36:21 +0200 Subject: [PATCH] qemu: Fix leak in qemuProcessInitCpuAffinity() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit In two out of three scenarios we are cleaning up properly after ourselves, but commit 5f2212c062c7 has changed the remaining one in a way that caused it to start leaking cpumapToSet. Refactor the logic so that cpumapToSet is always a freshly allocated bitmap that gets cleaned up automatically thanks to VIR_AUTOPTR(); this also allows us to remove the hostcpumap variable. Reported-by: John Ferlan Signed-off-by: Andrea Bolognani Reviewed-by: Ján Tomko --- src/qemu/qemu_process.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index d44076288e..7d48c95973 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2464,8 +2464,7 @@ static int qemuProcessInitCpuAffinity(virDomainObjPtr vm) { int ret = -1; - virBitmapPtr cpumapToSet = NULL; - VIR_AUTOPTR(virBitmap) hostcpumap = NULL; + VIR_AUTOPTR(virBitmap) cpumapToSet = NULL; virDomainNumatuneMemMode mem_mode; qemuDomainObjPrivatePtr priv = vm->privateData; @@ -2500,11 +2499,11 @@ qemuProcessInitCpuAffinity(virDomainObjPtr vm) if (virNumaNodesetToCPUset(nodeset, &cpumapToSet) < 0) goto cleanup; } else if (vm->def->cputune.emulatorpin) { - cpumapToSet = vm->def->cputune.emulatorpin; + if (virBitmapCopy(cpumapToSet, vm->def->cputune.emulatorpin) < 0) + goto cleanup; } else { - if (qemuProcessGetAllCpuAffinity(&hostcpumap) < 0) + if (qemuProcessGetAllCpuAffinity(&cpumapToSet) < 0) goto cleanup; - cpumapToSet = hostcpumap; } if (cpumapToSet && -- 2.47.2