From: Li Zhang <zhlcindy@linux.vnet.ibm.com>
Date: Fri, 6 Sep 2013 11:15:25 +0000 (+0100)
Subject: qemu: avoid users specifying CPU features for non-x86 plaftorm.
X-Git-Tag: CVE-2013-4311~88
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b0ce42ca96a2cd47de485b12ae68932e060c2cf;p=thirdparty%2Flibvirt.git

qemu: avoid users specifying CPU features for non-x86 plaftorm.

Currently, only X86 provides users CPU features with CPUID instruction.
If users specify the features for non-x86, it should tell users to
remove them.

This patch is to report one error if features are specified by
users for non-x86 platform.

Signed-off-by: Li Zhang <zhlcindy@linux.vnet.ibm.com>
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index adb498397b..152143158f 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -10645,6 +10645,14 @@ qemuParseCommandLineCPU(virDomainDefPtr dom,
             if (*feature == '\0')
                 goto syntax;
 
+            if (dom->os.arch != VIR_ARCH_X86_64 &&
+                dom->os.arch != VIR_ARCH_I686) {
+                virReportError(VIR_ERR_INTERNAL_ERROR,
+                               _("%s platform doesn't support CPU features'"),
+                               virArchToString(dom->os.arch));
+                goto cleanup;
+             }
+
             if (STREQ(feature, "kvmclock")) {
                 bool present = (policy == VIR_CPU_FEATURE_REQUIRE);
                 size_t j;