avoid undefined shift in hpack DecodeInteger on crafted integer#3379
Open
ubeddulla wants to merge 1 commit into
Open
avoid undefined shift in hpack DecodeInteger on crafted integer#3379ubeddulla wants to merge 1 commit into
ubeddulla wants to merge 1 commit into
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR hardens HPACK integer decoding in src/brpc/details/hpack.cpp to avoid undefined behavior from shifting a uint64_t by 64+ bits when parsing crafted, over-long continuation sequences, and adds a regression test to ensure such inputs are rejected.
Changes:
- Add a guard in
DecodeIntegerto reject over-long continuation encodings before the shift amount can grow to an undefined range. - Add a unit test that feeds
0xFFfollowed by many0x80continuation octets and asserts decode failure.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
src/brpc/details/hpack.cpp |
Adds a continuation-length/shift guard in HPACK integer decoding to prevent undefined shifts on malformed inputs. |
test/brpc_hpack_unittest.cpp |
Adds a regression test covering a crafted over-long HPACK integer continuation sequence. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+556
to
+559
| if (m >= 32) { | ||
| LOG(ERROR) << "Source stream is likely malformed"; | ||
| return -1; | ||
| } |
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.
What problem does this PR solve?
Issue Number:
Problem Summary:
DecodeIntegerkeeps consuming HPACK continuation octets whiletmp < MAX_HPACK_INTEGER. A run of0x80octets carries a zero payload, sotmpnever grows and that guard never trips, while the shift amountmkeeps climbing; oncemreaches 64 the<< mon auint64_tis undefined behavior. UBSan reportsshift exponent 70 is too large for 64-bit type. It is reachable from any HTTP/2 or gRPC peer via a crafted HEADERS frame whose index is encoded as0xFFfollowed by continuation octets.What is changed and the side effects?
Changed:
Reject the over-long encoding once
mreaches 32, before the shift can leave the type width. A valid integer belowMAX_HPACK_INTEGERneeds only a handful of continuation octets, so no well-formed input is turned away. A regression test inbrpc_hpack_unittest.cppdecodes0xFFplus a long run of0x80and checks it is rejected.Side effects:
Performance effects: one extra comparison per continuation octet, no measurable change.
Breaking backward compatibility: none.
Check List: