From 28894754f079527609645607bb44fb268259bf2c Mon Sep 17 00:00:00 2001
Message-Id: <28894754f079527609645607bb44fb268259bf2c@dist-git>
From: Erik Skultety <eskultet@redhat.com>
Date: Thu, 22 Jan 2015 15:53:57 +0100
Subject: [PATCH] util: check for an illegal character in a XML namespace
 prefix

https://bugzilla.redhat.com/show_bug.cgi?id=1184929

When user tries to insert element metadata providing a namespace
declaration as well, currently we insert the element without any validation
check for XML prefix (if provided). The next VM start would then
fail with parse error. This patch fixes this issue by adding a call to
xmlValidateNCName function to check for illegal characters in the
prefix.
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1143921

(cherry picked from commit 2c22954f99a70ed654e4116a18f433afa24d41c5)

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 src/util/virxml.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/util/virxml.c b/src/util/virxml.c
index 88a1196..88c1fcc 100644
--- a/src/util/virxml.c
+++ b/src/util/virxml.c
@@ -1074,6 +1074,12 @@ virXMLInjectNamespace(xmlNodePtr node,
 {
     xmlNsPtr ns;
 
+    if (xmlValidateNCName((const unsigned char *)key, 1) != 0) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("failed to validate prefix for a new XML namespace"));
+        return -1;
+    }
+
     if (!(ns = xmlNewNs(node, (const unsigned char *)uri, (const unsigned char *)key))) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                        _("failed to create a new XML namespace"));
-- 
2.2.1