From nobody Sat May 18 17:34:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1531473881830743.0470190994438; Fri, 13 Jul 2018 02:24:41 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ECF543082136; Fri, 13 Jul 2018 09:24:39 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B2E4860BE5; Fri, 13 Jul 2018 09:24:39 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 6411518037ED; Fri, 13 Jul 2018 09:24:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6D9OaRp026392 for ; Fri, 13 Jul 2018 05:24:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0DB9E1C70E; Fri, 13 Jul 2018 09:24:36 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id A3B6D1C716 for ; Fri, 13 Jul 2018 09:24:33 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Fri, 13 Jul 2018 11:24:29 +0200 Message-Id: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] virnetdevtap: Don't crash on !ifname in virNetDevTapInterfaceStats X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Fri, 13 Jul 2018 09:24:40 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" https://bugzilla.redhat.com/show_bug.cgi?id=3D1595184 Some domain 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 --- src/util/virnetdevtap.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index bd0710ad2e..2123ffe718 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -691,6 +691,12 @@ virNetDevTapInterfaceStats(const char *ifname, FILE *fp; char line[256], *colon; =20 + if (!ifname) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Interface not found")); + return -1; + } + fp =3D fopen("/proc/net/dev", "r"); if (!fp) { virReportSystemError(errno, "%s", @@ -781,7 +787,7 @@ virNetDevTapInterfaceStats(const char *ifname, if (ifa->ifa_addr->sa_family !=3D AF_LINK) continue; =20 - if (STREQ(ifa->ifa_name, ifname)) { + if (STREQ_NULLABLE(ifa->ifa_name, ifname)) { ifd =3D (struct if_data *)ifa->ifa_data; if (swapped) { stats->tx_bytes =3D ifd->ifi_ibytes; --=20 2.16.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list