libnetwork/drivers/bridge: setupIPChains: fix defer checking wrong err

thaJeztah · thaJeztah · commit 01a55860c62d · 2024-12-16T16:46:31.000+01:00
The output variable was renamed in 0503cf2, but that commit failed to change this defer, which was now checking the wrong error. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git a/libnetwork/drivers/bridge/setup_ip_tables_linux.go b/libnetwork/drivers/bridge/setup_ip_tables_linux.go
@@ -72,7 +72,7 @@ func setupIPChains(config configuration, version iptables.IPVersion) (natChain *
 		return nil, nil, nil, nil, fmt.Errorf("failed to create FILTER chain %s: %v", DockerChain, err)
 	}
 	defer func() {
-		if err != nil {
+		if retErr != nil {
 			if err := iptable.RemoveExistingChain(DockerChain, iptables.Filter); err != nil {
 				log.G(context.TODO()).Warnf("failed on removing iptables FILTER chain %s on cleanup: %v", DockerChain, err)
 			}

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ func setupIPChains(config configuration, version iptables.IPVersion) (natChain *`
`72`	`72`	`return nil, nil, nil, nil, fmt.Errorf("failed to create FILTER chain %s: %v", DockerChain, err)`
`73`	`73`	`}`
`74`	`74`	`defer func() {`
`75`		`- if err != nil {`
	`75`	`+ if retErr != nil {`
`76`	`76`	`if err := iptable.RemoveExistingChain(DockerChain, iptables.Filter); err != nil {`
`77`	`77`	`log.G(context.TODO()).Warnf("failed on removing iptables FILTER chain %s on cleanup: %v", DockerChain, err)`
`78`	`78`	`}`