Fix socket race condition in port tracking#40187
Open
chemwolf6922 wants to merge 1 commit intomasterfrom
Open
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Note
Copilot was unable to run its full agentic suite in this review.
This PR removes the background thread used to resolve port-0 (ephemeral) binds and instead resolves them inline in the main GnsPortTracker::Run() loop to avoid duplicating sockets and triggering race conditions.
Changes:
- Removed deferred port-0 resolution thread/queues and related synchronization primitives.
- Made
ResolvePortZeroBindreturnstd::optional<PortAllocation>and resolve/register port-0 binds synchronously. - Simplified port-0 bind processing by directly calling
HandleRequest/TrackPortafter resolution.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| src/linux/init/GnsPortTracker.h | Removes deferred-resolution thread machinery; updates ResolvePortZeroBind signature to return an optional allocation. |
| src/linux/init/GnsPortTracker.cpp | Deletes deferred resolver thread/queues; resolves port-0 binds inline and registers allocations immediately. |
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
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.
Summary of the Pull Request
This PR makes the bind 0 port resolution in port tracking inline. To avoid duplicating the socket and causing race conditions. With the trade off of even slower bind calls.
PR Checklist
Detailed Description of the Pull Request / Additional comments
#40178 would be a better but much more complex solution. Which may not be worth it if the seccomp part is still required.
Validation Steps Performed
The problem described in #40109 is reproduceable. I have validated that this PR will fix the issue.
NetworkTests::MirroredTests::PortZeroBindIsTracked [Passed]
NetworkTests::VirtioProxyTests::PortZeroBindIsTracked [Passed]