fix off-by-one in ProtocolGet and ProtocolOpenDir recv buffers#6171
Open
aizu-m wants to merge 1 commit into
Open
fix off-by-one in ProtocolGet and ProtocolOpenDir recv buffers#6171aizu-m wants to merge 1 commit into
aizu-m wants to merge 1 commit into
Conversation
|
Thank you for submitting a pull request! Maybe @craigcomstock can review this? |
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.
Tracing the file-receive path in
libcfnet/protocol.c.TLSRecv()NUL-terminates what it reads:So the buffer must hold
toget + 1bytes.net.cdoes exactly that alreadywith
char proto[CF_INBAND_OFFSET + 1]for aCF_INBAND_OFFSETread.ProtocolGet()andProtocolOpenDir()declarebuf[CF_MSGSIZE]yet receiveup to
CF_MSGSIZEbytes. GET goes straight throughTLSRecv(ssl, buf, CF_MSGSIZE). OPENDIR goes throughReceiveTransaction(), whose length cap isCF_BUFSIZE - CF_INBAND_OFFSET, i.e.CF_MSGSIZE. A peer that fills therecord makes
receivedreachCF_MSGSIZE, so the terminating NUL is writtento
buf[CF_MSGSIZE], one byte past the array. The byte count is servercontrolled, so the reach crosses the trust boundary.
Confirmed by modelling the terminating write with a guard byte placed right
after the buffer: the guard is clobbered at
CF_MSGSIZE, intact once thebuffer is
CF_BUFSIZE.ProtocolStat()in the same file already sizes its bufferCF_BUFSIZE. Theother two now match it.