Skip to content

[27.x backport] libnetwork/drivers/bridge: setupIPChains: fix defer checking wrong err#49110

Merged
akerouanton merged 1 commit intomoby:27.xfrom
thaJeztah:27.x_backport_fix_setupIPChains_defer
Dec 16, 2024
Merged

[27.x backport] libnetwork/drivers/bridge: setupIPChains: fix defer checking wrong err#49110
akerouanton merged 1 commit intomoby:27.xfrom
thaJeztah:27.x_backport_fix_setupIPChains_defer

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Dec 16, 2024

The output variable was renamed in 0503cf2, but that commit failed to change this defer, which was now checking the wrong error.

(cherry picked from commit 01a5586)

- Description for the changelog

networking: fixed a bug that could result in a iptables DOCKER FILTER chain not being cleaned up on failure [moby/moby#49109](ttps://github.com/moby/moby/pull/49109)

- A picture of a cute animal (not mandatory but encouraged)

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>
(cherry picked from commit 01a5586)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added this to the 27.4.1 milestone Dec 16, 2024
@thaJeztah thaJeztah self-assigned this Dec 16, 2024
@thaJeztah thaJeztah changed the title libnetwork/drivers/bridge: setupIPChains: fix defer checking wrong err [27.x backport] libnetwork/drivers/bridge: setupIPChains: fix defer checking wrong err Dec 16, 2024
@akerouanton akerouanton merged commit bd7da11 into moby:27.x Dec 16, 2024
@thaJeztah thaJeztah deleted the 27.x_backport_fix_setupIPChains_defer branch December 16, 2024 17:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants