|
 |
6ae9ed |
From 295e298a18e91a62cadf756f65de7edc99235b42 Mon Sep 17 00:00:00 2001
|
|
|
6ae9ed |
Message-Id: <295e298a18e91a62cadf756f65de7edc99235b42@dist-git>
|
|
|
6ae9ed |
From: Martin Kletzander <mkletzan@redhat.com>
|
|
|
6ae9ed |
Date: Wed, 24 Aug 2016 16:10:59 -0400
|
|
|
6ae9ed |
Subject: [PATCH] conf: Make really sure we don't access non-existing vCPUs
|
|
|
6ae9ed |
again
|
|
|
6ae9ed |
|
|
|
6ae9ed |
https://bugzilla.redhat.com/show_bug.cgi?id=1097930
|
|
|
6ae9ed |
https://bugzilla.redhat.com/show_bug.cgi?id=1224341
|
|
|
6ae9ed |
|
|
|
6ae9ed |
MinGW complained that we might be dereferencing a NULL pointer. While
|
|
|
6ae9ed |
that can't be true, the logic certainly allows for that.
|
|
|
6ae9ed |
|
|
|
6ae9ed |
../../src/conf/domain_conf.c: In function 'virDomainDefPostParse':
|
|
|
6ae9ed |
../../src/conf/domain_conf.c:4224:18: error: potential null pointer dereference [-Werror=null-dereference]
|
|
|
6ae9ed |
if (!vcpu->online && vcpu->cpumask) {
|
|
|
6ae9ed |
~~~~^~~~~~~~
|
|
|
6ae9ed |
|
|
|
6ae9ed |
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
|
|
|
6ae9ed |
(cherry picked from commit 05f89657eed52550050f9308bb7cb8d56dde9cd0)
|
|
|
6ae9ed |
---
|
|
|
6ae9ed |
src/conf/domain_conf.c | 2 +-
|
|
|
6ae9ed |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
6ae9ed |
|
|
|
6ae9ed |
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
|
|
|
6ae9ed |
index 7fa4701..8e5afe7 100644
|
|
|
6ae9ed |
--- a/src/conf/domain_conf.c
|
|
|
6ae9ed |
+++ b/src/conf/domain_conf.c
|
|
|
6ae9ed |
@@ -4302,7 +4302,7 @@ virDomainDefRemoveOfflineVcpuPin(virDomainDefPtr def)
|
|
|
6ae9ed |
for (i = 0; i < virDomainDefGetVcpusMax(def); i++) {
|
|
|
6ae9ed |
vcpu = virDomainDefGetVcpu(def, i);
|
|
|
6ae9ed |
|
|
|
6ae9ed |
- if (!vcpu->online && vcpu->cpumask) {
|
|
|
6ae9ed |
+ if (vcpu && !vcpu->online && vcpu->cpumask) {
|
|
|
6ae9ed |
virBitmapFree(vcpu->cpumask);
|
|
|
6ae9ed |
vcpu->cpumask = NULL;
|
|
|
6ae9ed |
|
|
|
6ae9ed |
--
|
|
|
6ae9ed |
2.10.0
|
|
|
6ae9ed |
|