Repository navigation
[HDX-5860] Disable multipath TCP in the OTel collector #3505
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| --- | ||
| '@hyperdx/otel-collector': patch | ||
| --- | ||
|
|
||
| Disable Multipath TCP in the collector image by setting `GODEBUG=multipathtcp=0` | ||
| at startup, mitigating CVE-2026-98432. Go 1.24+ opens MPTCP listeners by | ||
| default. Any other `GODEBUG` settings you pass are kept, and an explicit | ||
| `multipathtcp=` value is left as is. This also applies to the all-in-one image. | ||
| Patching the host kernel is still the actual fix. |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| #!/usr/bin/env bats | ||
|
|
||
| # The entrypoint must disable Go's default Multipath TCP listeners | ||
| # (CVE-2026-98432). In standalone mode the collector is exec'd as PID 1. | ||
|
|
||
| @test "GODEBUG: the collector process runs with multipathtcp=0" { | ||
| run docker compose exec -T otel-collector sh -c 'tr "\0" "\n" < /proc/1/environ' | ||
| [ "$status" -eq 0 ] | ||
| echo "$output" | grep -qx 'GODEBUG=multipathtcp=0' | ||
| } | ||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🔵 minor — Smoke test only covers the unset-GODEBUG standalone case, not the merge logic or the supervisor path
The only collector checked is the
otel-collectorservice insmoke-tests/otel-collector/docker-compose.yaml, which has noGODEBUGset. So the test would still pass if the${GODEBUG:+$GODEBUG,}append were broken (operator settings dropped or overwritten) or if the*multipathtcp=*case were inverted, and it never checks supervisor mode, where the protected listener belongs to a child process the supervisor spawns. Fix: add a compose service withGODEBUG=http2client=0and assertGODEBUG=http2client=0,multipathtcp=0. Add one withGODEBUG=multipathtcp=1and assert it is left as is. Ideally also runentrypoint.shin supervisor mode and assert thatGODEBUGreaches the spawned/otelcontribcol(read its/proc/<pid>/environ), not just PID 1.Advisory. Fix if it is a small defect in code this PR changes; otherwise reply in the thread. Do not widen the PR or touch files it did not already change. How to respond