Skip to content
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

sicslowpan vulnerability fixes #972

Merged
merged 8 commits into from Sep 26, 2019

Conversation

nvt
Copy link
Member

@nvt nvt commented May 24, 2019

This PR fixes a number of problems with packet processing in the sicslowpan implementation. PR #900 should pass with the help of these changes.

For future work, it could be good to redesign the sicslowpan module, as it has become a bit convoluted.

Thanks to Tobias Scharnowski for reporting the issues with the add_fragment and store_fragment functions, and the possible use of previous packet data when reassembling a packet.

@nvt nvt added pr/bugfix Used for PRs that fix a bug of any severity bug/vulnerability labels May 24, 2019
@simonduq simonduq added this to the Version 4.4 milestone Jul 12, 2019
@simonduq
Copy link
Member

This seems reasonable to me. Would like to hear what @nfi @joakimeriksson think

@joakimeriksson
Copy link
Member

I am hoping to take a pass at that tomorrow and hopefully merge!

@nvt nvt force-pushed the sicslowpan-reassembly-fixes branch from efc7752 to f737794 Compare September 26, 2019 13:27
Copy link
Member

@joakimeriksson joakimeriksson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Based on what I can see this looks very good. I also see that we do have a few fragmentation tests in the regression tests so it should be safe to merge!

@g-oikonomou g-oikonomou merged commit 5884a12 into contiki-ng:develop Sep 26, 2019
@nvt nvt deleted the sicslowpan-reassembly-fixes branch October 9, 2020 14:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug/vulnerability pr/bugfix Used for PRs that fix a bug of any severity
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants