|
 |
0a7476 |
From 2ebba4a1ef6914c2b030b52c67c56d7aca49290f Mon Sep 17 00:00:00 2001
|
|
|
0a7476 |
Message-Id: <2ebba4a1ef6914c2b030b52c67c56d7aca49290f@dist-git>
|
|
|
0a7476 |
From: Andrea Bolognani <abologna@redhat.com>
|
|
|
0a7476 |
Date: Fri, 7 Jun 2019 11:59:09 +0200
|
|
|
0a7476 |
Subject: [PATCH] qemu: Fix NULL pointer access in qemuProcessInitCpuAffinity()
|
|
|
0a7476 |
MIME-Version: 1.0
|
|
|
0a7476 |
Content-Type: text/plain; charset=UTF-8
|
|
|
0a7476 |
Content-Transfer-Encoding: 8bit
|
|
|
0a7476 |
|
|
|
0a7476 |
Commit 2f2254c7f4e5 attempted to fix a memory leak by ensuring
|
|
|
0a7476 |
cpumapToSet is always a freshly allocated bitmap, but regrettably
|
|
|
0a7476 |
introduced a NULL pointer access while doing so, because it called
|
|
|
0a7476 |
virBitmapCopy() without allocating the destination bitmap first.
|
|
|
0a7476 |
|
|
|
0a7476 |
Solve the issue by using virBitmapNewCopy() instead.
|
|
|
0a7476 |
|
|
|
0a7476 |
Reported-by: John Ferlan <jferlan@redhat.com>
|
|
|
0a7476 |
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
0a7476 |
Reviewed-by: Erik Skultety <eskultet@redhat.com>
|
|
|
0a7476 |
Reviewed-by: John Ferlan <jferlan@redhat.com>
|
|
|
0a7476 |
(cherry picked from commit a84922c09e9e1a0ca4f8fb1e8b4b1c7b55bd79e9)
|
|
|
0a7476 |
|
|
|
0a7476 |
https://bugzilla.redhat.com/show_bug.cgi?id=1718172
|
|
|
0a7476 |
|
|
|
0a7476 |
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
0a7476 |
Message-Id: <20190607095909.5538-3-abologna@redhat.com>
|
|
|
0a7476 |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
0a7476 |
---
|
|
|
0a7476 |
src/qemu/qemu_process.c | 2 +-
|
|
|
0a7476 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
0a7476 |
|
|
|
0a7476 |
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
|
|
|
0a7476 |
index f68a345c54..9e6e6528e2 100644
|
|
|
0a7476 |
--- a/src/qemu/qemu_process.c
|
|
|
0a7476 |
+++ b/src/qemu/qemu_process.c
|
|
|
0a7476 |
@@ -2391,7 +2391,7 @@ qemuProcessInitCpuAffinity(virDomainObjPtr vm)
|
|
|
0a7476 |
if (virNumaNodesetToCPUset(nodeset, &cpumapToSet) < 0)
|
|
|
0a7476 |
return -1;
|
|
|
0a7476 |
} else if (vm->def->cputune.emulatorpin) {
|
|
|
0a7476 |
- if (virBitmapCopy(cpumapToSet, vm->def->cputune.emulatorpin) < 0)
|
|
|
0a7476 |
+ if (!(cpumapToSet = virBitmapNewCopy(vm->def->cputune.emulatorpin)))
|
|
|
0a7476 |
return -1;
|
|
|
0a7476 |
} else {
|
|
|
0a7476 |
if (qemuProcessGetAllCpuAffinity(&cpumapToSet) < 0)
|
|
|
0a7476 |
--
|
|
|
0a7476 |
2.21.0
|
|
|
0a7476 |
|