|
 |
43618d |
From 658f4b3c39c9bdd490a44175742f8259dd10b84f Mon Sep 17 00:00:00 2001
|
|
|
43618d |
From: Michal Privoznik <mprivozn@redhat.com>
|
|
|
43618d |
Date: Wed, 2 Oct 2013 09:18:02 +0200
|
|
|
43618d |
Subject: [PATCH] virNetDevBandwidthEqual: Make it more robust
|
|
|
43618d |
|
|
|
43618d |
So far the virNetDevBandwidthEqual() expected both ->in and ->out items
|
|
|
43618d |
to be allocated for both @a and @b compared. This is not necessary true
|
|
|
43618d |
for all our code. For instance, running 'update-device' twice over a NIC
|
|
|
43618d |
with the very same XML results in SIGSEGV-ing in this function.
|
|
|
43618d |
|
|
|
43618d |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
43618d |
(cherry picked from commit ee02fbc8e4a24c1347761ceff2ddb2c108e9611c)
|
|
|
43618d |
---
|
|
|
43618d |
src/util/virnetdevbandwidth.c | 26 ++++++++++++++++++++------
|
|
|
43618d |
1 file changed, 20 insertions(+), 6 deletions(-)
|
|
|
43618d |
|
|
|
43618d |
diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c
|
|
|
43618d |
index 42b0a50..17f4fa3 100644
|
|
|
43618d |
--- a/src/util/virnetdevbandwidth.c
|
|
|
43618d |
+++ b/src/util/virnetdevbandwidth.c
|
|
|
43618d |
@@ -335,16 +335,30 @@ virNetDevBandwidthEqual(virNetDevBandwidthPtr a,
|
|
|
43618d |
return false;
|
|
|
43618d |
|
|
|
43618d |
/* in */
|
|
|
43618d |
- if (a->in->average != b->in->average ||
|
|
|
43618d |
- a->in->peak != b->in->peak ||
|
|
|
43618d |
- a->in->burst != b->in->burst)
|
|
|
43618d |
+ if (a->in) {
|
|
|
43618d |
+ if (!b->in)
|
|
|
43618d |
+ return false;
|
|
|
43618d |
+
|
|
|
43618d |
+ if (a->in->average != b->in->average ||
|
|
|
43618d |
+ a->in->peak != b->in->peak ||
|
|
|
43618d |
+ a->in->burst != b->in->burst)
|
|
|
43618d |
+ return false;
|
|
|
43618d |
+ } else if (b->in) {
|
|
|
43618d |
return false;
|
|
|
43618d |
+ }
|
|
|
43618d |
|
|
|
43618d |
/*out*/
|
|
|
43618d |
- if (a->out->average != b->out->average ||
|
|
|
43618d |
- a->out->peak != b->out->peak ||
|
|
|
43618d |
- a->out->burst != b->out->burst)
|
|
|
43618d |
+ if (a->out) {
|
|
|
43618d |
+ if (!b->out)
|
|
|
43618d |
+ return false;
|
|
|
43618d |
+
|
|
|
43618d |
+ if (a->out->average != b->out->average ||
|
|
|
43618d |
+ a->out->peak != b->out->peak ||
|
|
|
43618d |
+ a->out->burst != b->out->burst)
|
|
|
43618d |
+ return false;
|
|
|
43618d |
+ } else if (b->out) {
|
|
|
43618d |
return false;
|
|
|
43618d |
+ }
|
|
|
43618d |
|
|
|
43618d |
return true;
|
|
|
43618d |
}
|