Repository navigation
security: time out stalled SSH handshakes after 15s - #8335
Merged
Merged
Conversation
unknwon
added a commit
that referenced
this pull request
Jun 7, 2026
(cherry picked from commit 7da9cda)
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.
Describe the pull request
The built-in SSH server accepted TCP connections and handed them to
ssh.NewServerConnwithout setting a read deadline on the underlying socket. A client that connected but never sent the SSH banner held a file descriptor and goroutine open for the lifetime of the process. The deadline is now set to 15 seconds for the handshake and cleared once the session is established.This bounds per-connection FD lifetime and lets the server recover automatically after a flood stops. It does not by itself prevent a sustained flood from saturating the FD budget while the attack is running.
Refs GHSA-xp79-5mx3-jx52.
Checklist
Test plan
[server] START_SSH_SERVER = true).nc <host> 2222 < /dev/nullwhile suspending output).git clone ssh://...still completes normally well under 15 seconds.