]> xenbits.xensource.com Git - libvirt.git/commitdiff
virDomainDefParseXML: Check for malicious cpu ids in <numa/>
authorMichal Privoznik <mprivozn@redhat.com>
Fri, 7 Aug 2015 14:36:38 +0000 (16:36 +0200)
committerMichal Privoznik <mprivozn@redhat.com>
Fri, 7 Aug 2015 15:19:07 +0000 (17:19 +0200)
https://bugzilla.redhat.com/show_bug.cgi?id=1176020

Some users think this is a good idea:

      <vcpu placement='static'>4</vcpu>
      <cpu mode='host-model'>
        <model fallback='allow'/>
        <numa>
          <cell id='0' cpus='0-1' memory='1048576' unit='KiB'/>
          <cell id='1' cpus='9-10' memory='2097152' unit='KiB'/>
        </numa>
      </cpu>

It's not. Lets therefore introduce a check and discourage them in
doing so.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
src/conf/domain_conf.c

index 5eaeb218062e7411040994de250d9022b8ef670d..e4114f8210484207ed158f3cbc9cf7974586c936 100644 (file)
@@ -15105,6 +15105,12 @@ virDomainDefParseXML(xmlDocPtr xml,
         goto error;
     }
 
+    if (virDomainNumaGetMaxCPUID(def->numa) >= def->maxvcpus) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("CPU IDs in <numa> exceed the <vcpu> count"));
+        goto error;
+    }
+
     if (virDomainNumatuneParseXML(def->numa,
                                   def->placement_mode ==
                                   VIR_DOMAIN_CPU_PLACEMENT_MODE_STATIC,