Add missing nil check for DPC when processing wwan status update #4459
Conversation
This file contains 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
DPC can be still nil when DPCManager receives the first status from the wwan microservice. Without nil check, processWwanStatus function may therefore hit the nil dereference panic. Another small change in this commit is to avoid redundant calls to currentDPC() - dpc is already retrieved at the beginning of the function. Signed-off-by: Milan Lenco <[email protected]>
milan-zededa
requested review from
uncleDecart,
eriknordmark and
naiming-zededa
milan-zededa
added
bug
christoph-zededa
approved these changes
Dec 4, 2024
eriknordmark
reviewed
Dec 4, 2024
| @@ -76,14 +76,14 @@ func (m *DpcManager) processWwanStatus(ctx context.Context, status types.WwanSta | |||
| } | |||
|
|
|||
| if changed || wasInProgress { | |||
| if m.currentDPC() != nil { | |||
| changedDPC := m.setDiscoveredWwanIfNames(m.currentDPC()) | |||
| if dpc != nil { | |||
There was a problem hiding this comment.
Trying to understand whether is line change is fixing something or just making it easier to read and follow. Is there a case where m.currentDPC() would change between line 16 and this line?
There was a problem hiding this comment.
According to the commit message, it's just a refactoring not to call the same function twice.
There was a problem hiding this comment.
Yes, correct, DPCManager runs as one Go routine so m.currentDPC() called here returns the same thing and it is redundant to call it multiple times.
OhmSpectator
approved these changes
Dec 4, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
DPC can be still nil when
DPCManagerreceives the first status from the wwan microservice. Without the nil check,processWwanStatusfunction may therefore hit the nil dereference panic.Another small change in this commit is to avoid redundant calls to
currentDPC()- dpc is already retrieved at the beginning of the function.The issue was found during 13.4 LTS testing - it is also the only LTS version affected (the problematic if-statement was added in 12.5.0)