orchagent: Add missing end() check in VNetRouteOrch custom monitor lookup#4347
Merged
prsunny merged 1 commit intosonic-net:masterfrom Mar 20, 2026
Merged
Conversation
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
…okup syncd_tunnel_routes_[vnet].find(ipPrefix) result is dereferenced without checking against end(). If the route is absent from syncd_tunnel_routes_ while custom_monitor_ep_updated is true, the unguarded dereference causes undefined behavior. Add an end() check before accessing the iterator. Signed-off-by: Uma Ramanathan <uramanathan@upscaleai.com>
uramanath
force-pushed
the
fix/vnetorch-missing-end-check
branch
from
d3e6e1b to
9399f2e
Compare
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
prsunny
approved these changes
Mar 20, 2026
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
3 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.
What I did
Added a missing
end()check before dereferencing afind()result inVNetRouteOrch::doRouteTask().Why I did it
syncd_tunnel_routes_[vnet].find(ipPrefix)is used without checking the iterator againstend(). If the route is absent fromsyncd_tunnel_routes_whilecustom_monitor_ep_updatedis true (e.g. due to a race between route deletion and monitor update), the unguarded dereference ofit_route->secondcauses undefined behavior and can crash orchagent.How I verified it
Code inspection. The fix wraps the two
getCustomMonitors()calls in anend()check — no change to normal-path behavior when the route exists.Signed-off-by: Uma Ramanathan uramanathan@upscaleai.com