From aa0f66af1237656b217f640a9877d5f1aa31cb41 Mon Sep 17 00:00:00 2001

Message-Id: <aa0f66af1237656b217f640a9877d5f1aa31cb41@dist-git>

From: Andrea Bolognani <abologna@redhat.com>

Date: Tue, 11 Jun 2019 10:55:06 +0200

Subject: [PATCH] qemu: Fix NULL pointer access in qemuProcessInitCpuAffinity()

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

Commit 2f2254c7f4e5 attempted to fix a memory leak by ensuring

cpumapToSet is always a freshly allocated bitmap, but regrettably

introduced a NULL pointer access while doing so, because it called

virBitmapCopy() without allocating the destination bitmap first.

Solve the issue by using virBitmapNewCopy() instead.

Reported-by: John Ferlan <jferlan@redhat.com>

Signed-off-by: Andrea Bolognani <abologna@redhat.com>

Reviewed-by: Erik Skultety <eskultet@redhat.com>

Reviewed-by: John Ferlan <jferlan@redhat.com>

(cherry picked from commit a84922c09e9e1a0ca4f8fb1e8b4b1c7b55bd79e9)

https://bugzilla.redhat.com/show_bug.cgi?id=1716908

Signed-off-by: Andrea Bolognani <abologna@redhat.com>

Message-Id: <20190611085506.12564-7-abologna@redhat.com>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

---

 src/qemu/qemu_process.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c

index d0945b9c65..c220accfaf 100644

--- a/src/qemu/qemu_process.c

+++ b/src/qemu/qemu_process.c

@@ -2391,7 +2391,7 @@ qemuProcessInitCpuAffinity(virDomainObjPtr vm)

         if (virNumaNodesetToCPUset(nodeset, &cpumapToSet) < 0)

             return -1;

     } else if (vm->def->cputune.emulatorpin) {

-        if (virBitmapCopy(cpumapToSet, vm->def->cputune.emulatorpin) < 0)

+        if (!(cpumapToSet = virBitmapNewCopy(vm->def->cputune.emulatorpin)))

             return -1;

     } else {

         if (qemuProcessGetAllCpuAffinity(&cpumapToSet) < 0)

-- 

2.22.0