From fb8458440bb6c36a04400f83595da821dd445039 Mon Sep 17 00:00:00 2001
Message-Id: <fb8458440bb6c36a04400f83595da821dd445039@dist-git>
From: Pavel Hrdina <phrdina@redhat.com>
Date: Fri, 29 Nov 2019 08:54:55 +0100
Subject: [PATCH] nwfilter: Remove redundant check if object exists
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The same check is done by virNWFilterBindingObjListAdd().  The main
issue with the current code is that if the object already exists we
would leak 'def' because 'obj' would be set and the cleanup code frees
'def' only if 'obj' is NULL.

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
(cherry picked from commit 3379193f1c73a7be6bd797a3cf790e6960195d3a)

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1766475

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Message-Id: <22531b7498d6fc2609c654d6efab9e5b2eac3819.1575014076.git.phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 src/nwfilter/nwfilter_driver.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
index ed34586105..ac3a964388 100644
--- a/src/nwfilter/nwfilter_driver.c
+++ b/src/nwfilter/nwfilter_driver.c
@@ -752,13 +752,6 @@ nwfilterBindingCreateXML(virConnectPtr conn,
     if (virNWFilterBindingCreateXMLEnsureACL(conn, def) < 0)
         goto cleanup;
 
-    obj = virNWFilterBindingObjListFindByPortDev(driver->bindings, def->portdevname);
-    if (obj) {
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("Filter already present for NIC %s"), def->portdevname);
-        goto cleanup;
-    }
-
     obj = virNWFilterBindingObjListAdd(driver->bindings,
                                        def);
     if (!obj)
-- 
2.24.0