-
Notifications
You must be signed in to change notification settings - Fork 2.1k
nrf802154: Validate frame length before dst filter #11191
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
ee2a715
nrf802154: Validate frame length before dst filter
bergzand ae120c5
fixup! nrf802154: Validate frame length before dst filter
bergzand 38e88d1
netdev_ieee802154: Add data frame validation filter
bergzand 8e8b011
fixup! fixup! nrf802154: Validate frame length before dst filter
bergzand File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -279,4 +279,21 @@ int netdev_ieee802154_dst_filter(netdev_ieee802154_t *dev, const uint8_t *mhr) | |
| return 1; | ||
| } | ||
|
|
||
| int netdev_ieee802154_data_frame_filter(netdev_ieee802154_t *dev, | ||
| const uint8_t *mhr, size_t frame_len) | ||
| { | ||
| if (frame_len < IEEE802154_FCF_LEN) { | ||
| return 1; | ||
| } | ||
| size_t expected_len = ieee802154_get_frame_hdr_len(mhr); | ||
| /* Check lenght data type, length and destination filter */ | ||
| if ((expected_len != 0) && | ||
| (frame_len > expected_len) && | ||
| ((*mhr & IEEE802154_FCF_TYPE_MASK) == IEEE802154_FCF_TYPE_DATA) && | ||
| (netdev_ieee802154_dst_filter(dev, mhr) == 0)) { | ||
| return 0; | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Okay, I think you mixed up the return values. |
||
| } | ||
| return 1; | ||
| } | ||
|
|
||
| /** @} */ | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't this be zero?
ae120c5#diff-864e98442504008c9fad4791703b0e35R144