|
 |
9c6c51 |
From 9996e3dd0e17e3019881e097bc38ac25527cddb1 Mon Sep 17 00:00:00 2001
|
|
|
9c6c51 |
Message-Id: <9996e3dd0e17e3019881e097bc38ac25527cddb1@dist-git>
|
|
|
9c6c51 |
From: Michal Privoznik <mprivozn@redhat.com>
|
|
|
9c6c51 |
Date: Wed, 25 Jul 2018 13:52:55 +0200
|
|
|
9c6c51 |
Subject: [PATCH] domain_nwfilter: Return early if net has no name in
|
|
|
9c6c51 |
virDomainConfNWFilterTeardownImpl
|
|
|
9c6c51 |
MIME-Version: 1.0
|
|
|
9c6c51 |
Content-Type: text/plain; charset=UTF-8
|
|
|
9c6c51 |
Content-Transfer-Encoding: 8bit
|
|
|
9c6c51 |
|
|
|
9c6c51 |
https://bugzilla.redhat.com/show_bug.cgi?id=1607831
|
|
|
9c6c51 |
|
|
|
9c6c51 |
This function is called from various clean up paths (e.g.
|
|
|
9c6c51 |
from qemuBuildInterfaceCommandLine). However, depending on the
|
|
|
9c6c51 |
stage the interface creation process failed at, net->ifname might
|
|
|
9c6c51 |
still be not filled in when control jumps to cleanup label. If
|
|
|
9c6c51 |
that is the case return early (avoiding useless error message
|
|
|
9c6c51 |
produced in virNWFilterBindingLookupByPortDev) as there is no
|
|
|
9c6c51 |
NWFilter to tear down anyway.
|
|
|
9c6c51 |
|
|
|
9c6c51 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
9c6c51 |
Reviewed-by: Erik Skultety <eskultet@redhat.com>
|
|
|
9c6c51 |
(cherry picked from commit 3087b27cffdd46ad0e953e061d6f3c519aefd5d8)
|
|
|
9c6c51 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
9c6c51 |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
9c6c51 |
---
|
|
|
9c6c51 |
src/conf/domain_nwfilter.c | 3 +++
|
|
|
9c6c51 |
1 file changed, 3 insertions(+)
|
|
|
9c6c51 |
|
|
|
9c6c51 |
diff --git a/src/conf/domain_nwfilter.c b/src/conf/domain_nwfilter.c
|
|
|
9c6c51 |
index 24b5f42ddd..f39c8a1f9b 100644
|
|
|
9c6c51 |
--- a/src/conf/domain_nwfilter.c
|
|
|
9c6c51 |
+++ b/src/conf/domain_nwfilter.c
|
|
|
9c6c51 |
@@ -133,6 +133,9 @@ virDomainConfNWFilterTeardownImpl(virConnectPtr conn,
|
|
|
9c6c51 |
{
|
|
|
9c6c51 |
virNWFilterBindingPtr binding;
|
|
|
9c6c51 |
|
|
|
9c6c51 |
+ if (!net->ifname)
|
|
|
9c6c51 |
+ return;
|
|
|
9c6c51 |
+
|
|
|
9c6c51 |
binding = virNWFilterBindingLookupByPortDev(conn, net->ifname);
|
|
|
9c6c51 |
if (!binding)
|
|
|
9c6c51 |
return;
|
|
|
9c6c51 |
--
|
|
|
9c6c51 |
2.18.0
|
|
|
9c6c51 |
|