Merge pull request #49110 from thaJeztah/27.x_backport_fix_setupIPChains_defer

akerouanton · web-flow · commit bd7da11e95e2 · 2024-12-16T18:49:52.000+01:00
[27.x backport] libnetwork/drivers/bridge: setupIPChains: fix defer checking wrong err
diff --git a/libnetwork/drivers/bridge/setup_ip_tables_linux.go b/libnetwork/drivers/bridge/setup_ip_tables_linux.go
@@ -66,7 +66,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
`@@ -66,7 +66,7 @@ func setupIPChains(config configuration, version iptables.IPVersion) (natChain *`
`66`	`66`	`return nil, nil, nil, nil, fmt.Errorf("failed to create FILTER chain %s: %v", DockerChain, err)`
`67`	`67`	`}`
`68`	`68`	`defer func() {`
`69`		`- if err != nil {`
	`69`	`+ if retErr != nil {`
`70`	`70`	`if err := iptable.RemoveExistingChain(DockerChain, iptables.Filter); err != nil {`
`71`	`71`	`log.G(context.TODO()).Warnf("failed on removing iptables FILTER chain %s on cleanup: %v", DockerChain, err)`
`72`	`72`	`}`