Merge pull request #49111 from thaJeztah/26.1_backport_fix_setupIPChains_defer

[26.1 backport] libnetwork/drivers/bridge: setupIPChains: fix defer checking wrong err
This commit is contained in:
Albin Kerouanton
2024-12-16 19:19:06 +01:00
committed by GitHub

View File

@@ -59,7 +59,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) return nil, nil, nil, nil, fmt.Errorf("failed to create FILTER chain %s: %v", DockerChain, err)
} }
defer func() { defer func() {
if err != nil { if retErr != nil {
if err := iptable.RemoveExistingChain(DockerChain, iptables.Filter); err != 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) log.G(context.TODO()).Warnf("failed on removing iptables FILTER chain %s on cleanup: %v", DockerChain, err)
} }