]> xenbits.xensource.com Git - libvirt.git/commitdiff
Revert "libxl: Fix possible invalid read"
authorJim Fehlig <jfehlig@suse.com>
Fri, 1 Nov 2013 14:22:18 +0000 (08:22 -0600)
committerJim Fehlig <jfehlig@suse.com>
Fri, 1 Nov 2013 15:05:36 +0000 (09:05 -0600)
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

src/libxl/libxl_driver.c

index 104ad31f8a1d64ab9816aee570cdd920d1bf80e2..6aab11fd7f778dc62d654e188de12f642b6871de 100644 (file)
@@ -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);
         }