]> xenbits.xensource.com Git - libvirt.git/commitdiff
virnetdevtap: Don't crash on !ifname in virNetDevTapInterfaceStats
authorMichal Privoznik <mprivozn@redhat.com>
Fri, 13 Jul 2018 09:08:32 +0000 (11:08 +0200)
committerMichal Privoznik <mprivozn@redhat.com>
Fri, 13 Jul 2018 13:38:41 +0000 (15:38 +0200)
https://bugzilla.redhat.com/show_bug.cgi?id=1595184

Some domain <interfaces/> do not have a name (because they are
not TAP devices). Therefore, if
virNetDevTapInterfaceStats(net->ifname, ...) is called an instant
crash occurs. In Linux version of the function strlen() is called
over the name and in BSD version STREQ() is called.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
src/util/virnetdevtap.c

index bd0710ad2e45b8942fe691607af2792f48793453..3118ca18e83bdc39f9911501997cacce13ca1640 100644 (file)
@@ -691,6 +691,12 @@ virNetDevTapInterfaceStats(const char *ifname,
     FILE *fp;
     char line[256], *colon;
 
+    if (!ifname) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("Interface name not provided"));
+        return -1;
+    }
+
     fp = fopen("/proc/net/dev", "r");
     if (!fp) {
         virReportSystemError(errno, "%s",
@@ -768,6 +774,12 @@ virNetDevTapInterfaceStats(const char *ifname,
     struct if_data *ifd;
     int ret = -1;
 
+    if (!ifname) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("Interface name not provided"));
+        return -1;
+    }
+
     if (getifaddrs(&ifap) < 0) {
         virReportSystemError(errno, "%s",
                              _("Could not get interface list"));