azure/ipam: Fix nil dereference with logger#11786
Merged
christarazi merged 1 commit intocilium:masterfrom May 30, 2020
Merged
Conversation
The code erroneously used `log` which is a global variable, that's unprotected by a mutex. The correct usage is to use `scopedLog` which is passed into ResyncInterfacesAndIPs(), which already has been locked by the caller of ResyncInterfacesAndIPs(). The caller is n.recalculate(). Fixes: cilium#11785 Fixes: 3dfd638 ("ipam: Move iterator logic into generic InstanceMap") Fixes: 9779b09 ("ipam: Support for Azure IPAM") Signed-off-by: Chris Tarazi <chris@isovalent.com>
|
Please set the appropriate release note label. |
Member
Author
|
test-me-please |
Member
Author
|
Travis hit #11560 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The code erroneously used
logwhich is a global variable, that'sunprotected by a mutex. The correct usage is to use
scopedLogwhich ispassed into ResyncInterfacesAndIPs(), which already has been locked by
the caller of ResyncInterfacesAndIPs(). The caller is n.recalculate().
Fixes: #11785
Fixes: 3dfd638 ("ipam: Move iterator logic into generic InstanceMap")
Fixes: 9779b09 ("ipam: Support for Azure IPAM")