The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/7007
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
From 75008b746cfaf8471db9fe4ce595e2bd6d366048 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@ubuntu.com>
Date: Wed, 11 Mar 2020 17:45:59 -0400
Subject: [PATCH] lxd/firewall: Don't create zombies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
---
lxd/firewall/drivers/drivers_nftables.go | 2 +-
lxd/firewall/drivers/drivers_xtables.go | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lxd/firewall/drivers/drivers_nftables.go
b/lxd/firewall/drivers/drivers_nftables.go
index 59309820ba..3c8a7d5fbe 100644
--- a/lxd/firewall/drivers/drivers_nftables.go
+++ b/lxd/firewall/drivers/drivers_nftables.go
@@ -96,6 +96,7 @@ func (d Nftables) nftParseRuleset() ([]nftGenericItem, error)
{
if err != nil {
return nil, err
}
+ defer cmd.Wait()
// This only extracts certain generic parts of the ruleset, see man
libnftables-json for more info.
v := &struct {
@@ -121,7 +122,6 @@ func (d Nftables) nftParseRuleset() ([]nftGenericItem,
error) {
}
}
- cmd.Wait()
return items, nil
}
diff --git a/lxd/firewall/drivers/drivers_xtables.go
b/lxd/firewall/drivers/drivers_xtables.go
index 1e3a2b741f..dd7ff16635 100644
--- a/lxd/firewall/drivers/drivers_xtables.go
+++ b/lxd/firewall/drivers/drivers_xtables.go
@@ -91,6 +91,7 @@ func (d Xtables) iptablesInUse(iptablesCmd string) bool {
if err != nil {
return false
}
+ defer cmd.Wait()
scanner := bufio.NewScanner(stdout)
for scanner.Scan() {
@@ -101,7 +102,6 @@ func (d Xtables) iptablesInUse(iptablesCmd string) bool {
return true
}
}
- cmd.Wait()
}
return false
@@ -118,6 +118,7 @@ func (d Xtables) ebtablesInUse() bool {
if err != nil {
return false
}
+ defer cmd.Wait()
scanner := bufio.NewScanner(stdout)
for scanner.Scan() {
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
