From: Daniel P. Berrange <berrange@redhat.com>
Date: Wed, 2 Oct 2013 11:24:54 +0000 (+0100)
Subject: Use 'vnet' as prefix for veth devices
X-Git-Tag: CVE-2013-4401~164
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fe3f108d85be7bffc0bfe08eaa10e24179797724;p=thirdparty%2Flibvirt.git

Use 'vnet' as prefix for veth devices

The XML parser reserves 'vnet' as a prefix for automatically
generated NIC device names. Switch the veth device creation
to use this prefix, so it does not have to worry about clashes
with user specified names in the XML.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c
index 1ccfc547a2..403961bf53 100644
--- a/src/util/virnetdevveth.c
+++ b/src/util/virnetdevveth.c
@@ -43,10 +43,10 @@ static int virNetDevVethExists(int devNum)
 {
     int ret;
     char *path = NULL;
-    if (virAsprintf(&path, "/sys/class/net/veth%d/", devNum) < 0)
+    if (virAsprintf(&path, "/sys/class/net/vnet%d/", devNum) < 0)
         return -1;
     ret = virFileExists(path) ? 1 : 0;
-    VIR_DEBUG("Checked dev veth%d usage: %d", devNum, ret);
+    VIR_DEBUG("Checked dev vnet%d usage: %d", devNum, ret);
     VIR_FREE(path);
     return ret;
 }
@@ -125,7 +125,7 @@ int virNetDevVethCreate(char** veth1, char** veth2)
             if ((veth1num = virNetDevVethGetFreeNum(vethNum)) < 0)
                 goto cleanup;
 
-            if (virAsprintf(&veth1auto, "veth%d", veth1num) < 0)
+            if (virAsprintf(&veth1auto, "vnet%d", veth1num) < 0)
                 goto cleanup;
             vethNum = veth1num + 1;
         }
@@ -134,7 +134,7 @@ int virNetDevVethCreate(char** veth1, char** veth2)
             if ((veth2num = virNetDevVethGetFreeNum(vethNum)) < 0)
                 goto cleanup;
 
-            if (virAsprintf(&veth2auto, "veth%d", veth2num) < 0)
+            if (virAsprintf(&veth2auto, "vnet%d", veth2num) < 0)
                 goto cleanup;
             vethNum = veth2num + 1;
         }