mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 17:34:18 +03:00
virnetdevtap: Don't crash on !ifname in virNetDevTapInterfaceStats
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>
This commit is contained in:
parent
4085984889
commit
318d54e520
@ -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"));
|
||||
|
Loading…
Reference in New Issue
Block a user