From: Marc Hartmayer <mhartmay@linux.vnet.ibm.com>
Date: Thu, 9 Feb 2017 14:13:35 +0000 (+0100)
Subject: qemu: Check if virQEMUCapsNewCopy(...) has failed
X-Git-Tag: CVE-2017-2635~138
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62b2c2fcdd39accc23f03e262695b863866dafb0;p=thirdparty%2Flibvirt.git

qemu: Check if virQEMUCapsNewCopy(...) has failed

Check if virQEMUCapsNewCopy(...) has failed, thus a segmentation fault
in virQEMUCapsFilterByMachineType(...) will be avoided.

Signed-off-by: Marc Hartmayer <mhartmay@linux.vnet.ibm.com>
Reviewed-by: Bjoern Walk <bwalk@linux.vnet.ibm.com>
---

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 3247d25675..399e314476 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -4928,6 +4928,10 @@ virQEMUCapsCacheLookupCopy(virCapsPtr caps,
 
     ret = virQEMUCapsNewCopy(qemuCaps);
     virObjectUnref(qemuCaps);
+
+    if (!ret)
+        return NULL;
+
     virQEMUCapsFilterByMachineType(ret, machineType);
     return ret;
 }