Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

envoy: Fix lock leak in config validation failure #23077

Merged
merged 1 commit into from
Jan 14, 2023

Conversation

joestringer
Copy link
Member

If XDS listener configuration validation failed, addListener() would not
unlock the XDSServer.mutex, leading to the lock being locked forever.
Fix it by using a standard defer() approach.

Fixes: 1042b81 ("envoy: Add xDS resource validation")

If XDS listener configuration validation failed, addListener() would not
unlock the XDSServer.mutex, leading to the lock being locked forever.
Fix it by using a standard defer() approach.

CC: Jarno Rajahalme <jarno@isovalent.com>
Fixes: 1042b81 ("envoy: Add xDS resource validation")
Signed-off-by: Joe Stringer <joe@cilium.io>
@joestringer joestringer requested a review from a team as a code owner January 12, 2023 21:07
@joestringer joestringer added needs-backport/1.12 release-note/bug This PR fixes an issue in a previous release of Cilium. labels Jan 12, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. and removed dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. labels Jan 12, 2023
@joestringer
Copy link
Member Author

Travis hit #23079 .

@joestringer
Copy link
Member Author

/test

@joestringer
Copy link
Member Author

ci-multicluster hit #21655, but this is not required in order to merge.

@joestringer joestringer merged commit 9ccaaf8 into cilium:master Jan 14, 2023
@joestringer joestringer deleted the submit/fix-xds-locking branch January 14, 2023 01:28
@aanm aanm mentioned this pull request Jan 18, 2023
30 tasks
@ldelossa ldelossa added backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. and removed backport-pending/1.13 labels Jan 18, 2023
@ldelossa ldelossa mentioned this pull request Jan 24, 2023
14 tasks
@michi-covalent michi-covalent added backport-done/1.12 The backport for Cilium 1.12.x for this PR is done. and removed backport-pending/1.12 labels Jan 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-done/1.12 The backport for Cilium 1.12.x for this PR is done. backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. release-note/bug This PR fixes an issue in a previous release of Cilium.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants