|
 |
51d9a2 |
From 1a0fbc2eba0d6fb6c52c806a53b3752dcca83246 Mon Sep 17 00:00:00 2001
|
|
|
51d9a2 |
Message-Id: <1a0fbc2eba0d6fb6c52c806a53b3752dcca83246@dist-git>
|
|
|
51d9a2 |
From: Michal Privoznik <mprivozn@redhat.com>
|
|
|
51d9a2 |
Date: Fri, 13 Jul 2018 15:44:42 +0200
|
|
|
51d9a2 |
Subject: [PATCH] virnetdevtap: Don't crash on !ifname in
|
|
|
51d9a2 |
virNetDevTapInterfaceStats
|
|
|
51d9a2 |
MIME-Version: 1.0
|
|
|
51d9a2 |
Content-Type: text/plain; charset=UTF-8
|
|
|
51d9a2 |
Content-Transfer-Encoding: 8bit
|
|
|
51d9a2 |
|
|
|
51d9a2 |
https://bugzilla.redhat.com/show_bug.cgi?id=1595184
|
|
|
51d9a2 |
|
|
|
51d9a2 |
Some domain <interfaces/> do not have a name (because they are
|
|
|
51d9a2 |
not TAP devices). Therefore, if
|
|
|
51d9a2 |
virNetDevTapInterfaceStats(net->ifname, ...) is called an instant
|
|
|
51d9a2 |
crash occurs. In Linux version of the function strlen() is called
|
|
|
51d9a2 |
over the name and in BSD version STREQ() is called.
|
|
|
51d9a2 |
|
|
|
51d9a2 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
51d9a2 |
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
51d9a2 |
(cherry picked from commit 318d54e5201295239869655c2c60fb44d9d9466e)
|
|
|
51d9a2 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
51d9a2 |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
51d9a2 |
---
|
|
|
51d9a2 |
src/util/virnetdevtap.c | 12 ++++++++++++
|
|
|
51d9a2 |
1 file changed, 12 insertions(+)
|
|
|
51d9a2 |
|
|
|
51d9a2 |
diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c
|
|
|
51d9a2 |
index bd0710ad2e..3118ca18e8 100644
|
|
|
51d9a2 |
--- a/src/util/virnetdevtap.c
|
|
|
51d9a2 |
+++ b/src/util/virnetdevtap.c
|
|
|
51d9a2 |
@@ -691,6 +691,12 @@ virNetDevTapInterfaceStats(const char *ifname,
|
|
|
51d9a2 |
FILE *fp;
|
|
|
51d9a2 |
char line[256], *colon;
|
|
|
51d9a2 |
|
|
|
51d9a2 |
+ if (!ifname) {
|
|
|
51d9a2 |
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
51d9a2 |
+ _("Interface name not provided"));
|
|
|
51d9a2 |
+ return -1;
|
|
|
51d9a2 |
+ }
|
|
|
51d9a2 |
+
|
|
|
51d9a2 |
fp = fopen("/proc/net/dev", "r");
|
|
|
51d9a2 |
if (!fp) {
|
|
|
51d9a2 |
virReportSystemError(errno, "%s",
|
|
|
51d9a2 |
@@ -768,6 +774,12 @@ virNetDevTapInterfaceStats(const char *ifname,
|
|
|
51d9a2 |
struct if_data *ifd;
|
|
|
51d9a2 |
int ret = -1;
|
|
|
51d9a2 |
|
|
|
51d9a2 |
+ if (!ifname) {
|
|
|
51d9a2 |
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
51d9a2 |
+ _("Interface name not provided"));
|
|
|
51d9a2 |
+ return -1;
|
|
|
51d9a2 |
+ }
|
|
|
51d9a2 |
+
|
|
|
51d9a2 |
if (getifaddrs(&ifap) < 0) {
|
|
|
51d9a2 |
virReportSystemError(errno, "%s",
|
|
|
51d9a2 |
_("Could not get interface list"));
|
|
|
51d9a2 |
--
|
|
|
51d9a2 |
2.18.0
|
|
|
51d9a2 |
|