Repository navigation
fix payload masking for buffers not aligned to 4 bytes - #14
Closed
PrefectSol wants to merge 1 commit into
Closed
PrefectSol wants to merge 1 commit into
PrefectSol wants to merge 1 commit into
Conversation
Owner
|
Thanks for reporting. Fixed in 2f74d01 |
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.
MaskKey::mask_alignedmasks the leading unaligned bytes with the correct key phase(
key_bytes[i & 3]), but the aligned chunks are then XORed with the key vector built fromthe unrotated key. When the number of leading bytes is not a multiple of 4, every byte after
the first chunk boundary is masked with the wrong key byte. This affects the SSE2, NEON and
64-bit fallback paths.
In practice the server receives corrupted frames: a text message sent from a buffer whose
address is not 4-byte aligned is rejected with close code 1007 ("bytes are not UTF-8").
Pong payloads masked in place inside the read buffer are affected the same way.
The existing tests do not catch this because they mask twice and compare with the original:
XOR with a consistently wrong key is still an involution.
Fix: rotate the key by the number of leading bytes (mod 4) before building the chunk key.
Added a test that compares against a byte-wise reference for offsets 0..31 and sizes 0..200;
it fails on main and passes with the fix.