upb: reject non-delimited unknowns when promoting to message extensions - #29509
Open
baradika wants to merge 1 commit into
Open
upb: reject non-delimited unknowns when promoting to message extensions#29509baradika wants to merge 1 commit into
baradika wants to merge 1 commit into
Conversation
upb_MiniTable_ParseUnknownMessage consumed an unknown field as a length-delimited message without first verifying its wire type. upb_Message_FindUnknown2 matches unknowns by field number only and deliberately does not constrain the wire type, so an unknown of any other wire type could be returned for a message-typed extension's field number and then be misinterpreted as length-delimited. In that case the field's own payload is read as the message length while the data pointer is already at the end of the unknown field, leaving the size passed to upb_Decode under attacker control and producing an out-of-bounds read. Check the wire type immediately after reading the tag and return the existing parse error for non-delimited types. Only the delimited wire type carries a length prefix, so this rejects precisely the inputs that the length-prefix assumption does not hold for. upb_Message_FindUnknown2 is intentionally left unchanged: its generic field-number semantics are required by its other callers. Add regression tests for a zero-length varint payload (silently promoted to an empty message before this change) and for a 0xFFFFFFFF payload (out-of-bounds read caught by ASan), plus a control case confirming a well-formed length-delimited unknown still promotes.
|
Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). View this failed invocation of the CLA check for more information. For the most up to date status, view the checks section at the bottom of the pull request. |
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.
upb_MiniTable_ParseUnknownMessage consumed an unknown field as a length-delimited message without first verifying its wire type. upb_Message_FindUnknown2 matches unknowns by field number only and deliberately does not constrain the wire type, so an unknown of any other wire type could be returned for a message-typed extension's field number and then be misinterpreted as length-delimited.
In that case the field's own payload is read as the message length while the data pointer is already at the end of the unknown field, leaving the size passed to upb_Decode under attacker control and producing an out-of-bounds read.
Check the wire type immediately after reading the tag and return the existing parse error for non-delimited types. Only the delimited wire type carries a length prefix, so this rejects precisely the inputs that the length-prefix assumption does not hold for.
upb_Message_FindUnknown2 is intentionally left unchanged: its generic field-number semantics are required by its other callers.
Add regression tests for a zero-length varint payload (silently promoted to an empty message before this change) and for a 0xFFFFFFFF payload (out-of-bounds read caught by ASan), plus a control case confirming a well-formed length-delimited unknown still promotes.