Raise InvalidPacketError on a truncated ISO data packet#958
Open
devitwise wants to merge 1 commit into
Open
Conversation
HCI_IsoDataPacket.from_bytes() called struct.unpack_from() without checking the buffer length first, so a short packet raised the low-level struct.error instead of the InvalidPacketError the other from_bytes() parsers raise. A 5-byte ISO packet (data_total_length=0, pb_flag=0b00) reproduces it: the SDU info read at offset 5 needs 4 bytes that are not there. Guard each unpack_from with a length check and raise InvalidPacketError, matching HCI_AclDataPacket.from_bytes(). Fixes google#955.
|
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. |
Author
|
@googlebot I signed it! |
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
1 participant
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.
Fixes #955.
HCI_IsoDataPacket.from_bytes()calledstruct.unpack_from()without first checking the buffer length, so a short packet surfaced the low-levelstruct.errorinstead of theInvalidPacketErrorthe siblingfrom_bytes()parsers raise. A 5-byte ISO packet (data_total_length=0,pb_flag=0b00) reproduces it: the SDU-info read at offset 5 needs 4 bytes that are not present.This guards each
unpack_fromwith a length check and raisesInvalidPacketError, matchingHCI_AclDataPacket.from_bytes().Test:
tests/hci_test.py::test_iso_data_packet_too_short(fails withstruct.errorbefore the change, passes after). Fullhci_test.pysuite green.