|
 |
d759b5 |
From fb8458440bb6c36a04400f83595da821dd445039 Mon Sep 17 00:00:00 2001
|
|
|
d759b5 |
Message-Id: <fb8458440bb6c36a04400f83595da821dd445039@dist-git>
|
|
|
d759b5 |
From: Pavel Hrdina <phrdina@redhat.com>
|
|
|
d759b5 |
Date: Fri, 29 Nov 2019 08:54:55 +0100
|
|
|
d759b5 |
Subject: [PATCH] nwfilter: Remove redundant check if object exists
|
|
|
d759b5 |
MIME-Version: 1.0
|
|
|
d759b5 |
Content-Type: text/plain; charset=UTF-8
|
|
|
d759b5 |
Content-Transfer-Encoding: 8bit
|
|
|
d759b5 |
|
|
|
d759b5 |
The same check is done by virNWFilterBindingObjListAdd(). The main
|
|
|
d759b5 |
issue with the current code is that if the object already exists we
|
|
|
d759b5 |
would leak 'def' because 'obj' would be set and the cleanup code frees
|
|
|
d759b5 |
'def' only if 'obj' is NULL.
|
|
|
d759b5 |
|
|
|
d759b5 |
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
d759b5 |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
d759b5 |
(cherry picked from commit 3379193f1c73a7be6bd797a3cf790e6960195d3a)
|
|
|
d759b5 |
|
|
|
d759b5 |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1766475
|
|
|
d759b5 |
|
|
|
d759b5 |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
d759b5 |
Message-Id: <22531b7498d6fc2609c654d6efab9e5b2eac3819.1575014076.git.phrdina@redhat.com>
|
|
|
d759b5 |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
d759b5 |
---
|
|
|
d759b5 |
src/nwfilter/nwfilter_driver.c | 7 -------
|
|
|
d759b5 |
1 file changed, 7 deletions(-)
|
|
|
d759b5 |
|
|
|
d759b5 |
diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
|
|
|
d759b5 |
index ed34586105..ac3a964388 100644
|
|
|
d759b5 |
--- a/src/nwfilter/nwfilter_driver.c
|
|
|
d759b5 |
+++ b/src/nwfilter/nwfilter_driver.c
|
|
|
d759b5 |
@@ -752,13 +752,6 @@ nwfilterBindingCreateXML(virConnectPtr conn,
|
|
|
d759b5 |
if (virNWFilterBindingCreateXMLEnsureACL(conn, def) < 0)
|
|
|
d759b5 |
goto cleanup;
|
|
|
d759b5 |
|
|
|
d759b5 |
- obj = virNWFilterBindingObjListFindByPortDev(driver->bindings, def->portdevname);
|
|
|
d759b5 |
- if (obj) {
|
|
|
d759b5 |
- virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
d759b5 |
- _("Filter already present for NIC %s"), def->portdevname);
|
|
|
d759b5 |
- goto cleanup;
|
|
|
d759b5 |
- }
|
|
|
d759b5 |
-
|
|
|
d759b5 |
obj = virNWFilterBindingObjListAdd(driver->bindings,
|
|
|
d759b5 |
def);
|
|
|
d759b5 |
if (!obj)
|
|
|
d759b5 |
--
|
|
|
d759b5 |
2.24.0
|
|
|
d759b5 |
|