From: Jim Fehlig <jfehlig@suse.com>
Date: Fri, 1 Nov 2013 14:22:18 +0000 (-0600)
Subject: Revert "libxl: Fix possible invalid read"
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=835f992a68f78ff0812d4302090af44e50dece02;p=libvirt.git

Revert "libxl: Fix possible invalid read"

This reverts commit 394d6e0a95ac91facba06ab43d67ae8600b14b0e.
The real problem is accessing the virtBitmap structure as a byte
array, which was correctly identified and fixed by Jeremy Fitzhardinge

https://www.redhat.com/archives/libvir-list/2013-October/msg01257.html
---

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 104ad31f8a..6aab11fd7f 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -454,7 +454,6 @@ libxlDomainSetVcpuAffinities(libxlDriverPrivatePtr driver, virDomainObjPtr vm)
     size_t cpumaplen;
     int vcpu;
     size_t i;
-    size_t limit;
     int ret = -1;
 
     if (libxlDoNodeGetInfo(driver, &nodeinfo) < 0)
@@ -471,8 +470,7 @@ libxlDomainSetVcpuAffinities(libxlDriverPrivatePtr driver, virDomainObjPtr vm)
 
         cpumask = (uint8_t*) def->cputune.vcpupin[vcpu]->cpumask;
 
-        limit = MIN(VIR_DOMAIN_CPUMASK_LEN, cpumaplen);
-        for (i = 0; i < limit; ++i) {
+        for (i = 0; i < VIR_DOMAIN_CPUMASK_LEN; ++i) {
             if (cpumask[i])
                 VIR_USE_CPU(cpumap, i);
         }