nul-terminate cookie read from control connection in iperf_accept - #2054
Open
dxbjavid wants to merge 1 commit into
Open
nul-terminate cookie read from control connection in iperf_accept#2054dxbjavid wants to merge 1 commit into
dxbjavid wants to merge 1 commit into
Conversation
Contributor
|
Thanks for the bug report and PR! We'll take a look. |
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.
Version of iperf3 (or development branch, such as
masteror3.1-STABLE) to which this pull request applies:masterIssues fixed (if any): none
Brief description of code changes (suitable for use as a commit message):
on the server,
iperf_accept()reads exactlyCOOKIE_SIZEbytes from the client's control connection intotest->cookie(achar[COOKIE_SIZE]) but never forces a terminating NUL, whereas a well behaved client only sends 36 characters plus a trailing NUL. A peer that sends 37 non-NUL bytes leaves the buffer unterminated, and it is then handled as a C string iniperf_on_connect()(copied into the JSONcookiefield and printed viareport_cookie), sostrlenreads past the array into the following struct members. This terminates the cookie right after it is read so the later string handling stays in bounds.