Blank out invalid interface names with escaped letters etc.

Check that interface names only contain valid characters. Blank them out
otherwise.
Valid characters in this code are currently a-z,A-Z,0-9, '-' and '_'.

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 66aa53ec3cd01e1c34e38c320a79ee87bf5ad921..bf4e657859bc63ad53b0dd24aaaeed17fc4e6a68 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1776,6 +1776,11 @@ cleanup:
 }
 
 
+static bool
+isValidIfname(const char *ifname) {
+    return (strspn(ifname, VALID_IFNAME_CHARS) == strlen(ifname));
+}
+
 
 /* Parse the XML definition for a network interface
  * @param node XML nodeset to parse for net definition
@@ -1859,8 +1864,10 @@ virDomainNetDefParseXML(virCapsPtr caps,
                        xmlStrEqual(cur->name, BAD_CAST "target")) {
                 ifname = virXMLPropString(cur, "dev");
                 if ((ifname != NULL) &&
-                    (STRPREFIX((const char*)ifname, "vnet"))) {
+                    ((STRPREFIX((const char*)ifname, "vnet")) ||
+                     (!isValidIfname(ifname)))) {
                     /* An auto-generated target name, blank it out */
+                    /* blank out invalid interface names */
                     VIR_FREE(ifname);
                 }
             } else if ((script == NULL) &&

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index ed1a4ad7f8b4ca72293b0fd562a5ca6a0bc3c566..69b64d649e97f333390edc46f94fb12c6af964c8 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -297,6 +297,9 @@ struct _virDomainNetDef {
     virNWFilterHashTablePtr filterparams;
 };
 
+# define VALID_IFNAME_CHARS \
+ "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_"
+
 enum virDomainChrTargetType {
     VIR_DOMAIN_CHR_TARGET_TYPE_NULL = 0,
     VIR_DOMAIN_CHR_TARGET_TYPE_MONITOR,