From: Ján Tomko <jtomko@redhat.com>
Date: Fri, 21 Jun 2013 17:20:31 +0000 (+0200)
Subject: bridge: don't crash on bandwidth unplug with no bandwidth
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=658c932ab4aec2222b0ce3840a96748e73b39b3f;p=people%2Fdariof%2Flibvirt.git

bridge: don't crash on bandwidth unplug with no bandwidth

If networkUnplugBandwidth is called on a network which has
no bandwidth defined, print a warning instead of crashing.

This can happen when destroying a domain with bandwidth if
bandwidth was removed from the network after the domain was
started.

https://bugzilla.redhat.com/show_bug.cgi?id=975359
---

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 2cf49bbce..fb1741fae 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -4871,6 +4871,11 @@ networkUnplugBandwidth(virNetworkObjPtr net,
 
     if (iface->data.network.actual &&
         iface->data.network.actual->class_id) {
+        if (!net->def->bandwidth || !net->def->bandwidth->in) {
+            VIR_WARN("Network %s has no bandwidth but unplug requested",
+                     net->def->name);
+            goto cleanup;
+        }
         /* we must remove class from bridge */
         new_rate = net->def->bandwidth->in->average;