From: Matthias Bolte <matthias.bolte@googlemail.com>
Date: Fri, 18 Feb 2011 09:09:32 +0000 (+0100)
Subject: esx: Ignore malformed host UUID from BIOS
X-Git-Tag: CVE-2011-1146~137
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=791da4e7367326b09357c94a5fd626efd8a85aa8;p=thirdparty%2Flibvirt.git

esx: Ignore malformed host UUID from BIOS

Etienne Gosset reported that libvirt fails to connect to his ESX
server because it failed to parse its malformed host UUID, that
contains an additional space and lacks one hexdigit in the last
group:

xxxxxxxx-xxxx-xxxx-xxxx- xxxxxxxxxxx

Don't treat this as a fatal error, just ignore it.
---

diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index 97f3dbec8b..116ad0f51f 100644
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -518,10 +518,11 @@ esxLookupHostSystemBiosUuid(esxPrivate *priv, unsigned char *uuid)
 
             if (strlen(dynamicProperty->val->string) > 0) {
                 if (virUUIDParse(dynamicProperty->val->string, uuid) < 0) {
-                    ESX_ERROR(VIR_ERR_INTERNAL_ERROR,
-                              _("Could not parse UUID from string '%s'"),
-                              dynamicProperty->val->string);
-                    goto cleanup;
+                    VIR_WARN("Could not parse host UUID from string '%s'",
+                             dynamicProperty->val->string);
+
+                    /* HostSystem has an invalid UUID, ignore it */
+                    memset(uuid, 0, VIR_UUID_BUFLEN);
                 }
             } else {
                 /* HostSystem has an empty UUID */