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

gnrc_sixlowpan: Various hardening fixes #18817

Merged
merged 10 commits into from
Oct 29, 2022

Conversation

miri64
Copy link
Member

@miri64 miri64 commented Oct 28, 2022

Contribution description

Title says everything

Testing procedure

Fragmentation and header compression (e.g. as outlined in Release Specs 4 and 6) should still work.

Issues/PRs references

@miri64
Copy link
Member Author

miri64 commented Oct 28, 2022

Fragmentation and header compression (e.g. as outlined in Release Specs 4 and 6) should still work.

See https://github.com/RIOT-OS/RIOT/actions/runs/3345458318 https://github.com/RIOT-OS/RIOT/actions/runs/3346308008

@miri64 miri64 added Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) Process: needs backport Integration Process: The PR is required to be backported to a release or feature branch CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Oct 28, 2022
@benpicco benpicco requested a review from maribu October 28, 2022 12:44
@riot-ci
Copy link

riot-ci commented Oct 28, 2022

Murdock results

✔️ PASSED

3c7c9fe tests/unittests: fix get_frame_hdr_len tests for hardened parsing

Success Failures Total Runtime
2032 0 2032 09m:57s

Artifacts

This only reflects a subset of all builds from https://ci-prod.riot-os.org. Please refer to https://ci.riot-os.org for a complete build for now.

@miri64 miri64 force-pushed the gnrc_sixlowpan/fix/harden branch from c228beb to 8875cc0 Compare October 28, 2022 14:44
@github-actions github-actions bot added the Area: tests Area: tests and testing framework label Oct 28, 2022
@miri64 miri64 force-pushed the gnrc_sixlowpan/fix/harden branch 2 times, most recently from 491c523 to ad44030 Compare October 28, 2022 15:05
@miri64 miri64 enabled auto-merge October 28, 2022 16:27
@miri64 miri64 added CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR and removed CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Oct 28, 2022
@miri64
Copy link
Member Author

miri64 commented Oct 28, 2022

Would be great if someone(TM) could fix this randomly failing test...

@miri64
Copy link
Member Author

miri64 commented Oct 28, 2022

Mhhh fails pretty reliably on ci-prod :-/... but I can not reproduce this locally.

@miri64
Copy link
Member Author

miri64 commented Oct 28, 2022

Ok, release tests also fail for 6.6 (UDP without payload). Since this touches IPHC and NHC, I wager, this is a regression :-/. Will look into it.

@miri64 miri64 force-pushed the gnrc_sixlowpan/fix/harden branch from ad44030 to 3c7c9fe Compare October 28, 2022 22:59
@miri64 miri64 added CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR CI: run tests If set, CI server will run tests on hardware for the labeled PR and removed CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Oct 28, 2022
@miri64
Copy link
Member Author

miri64 commented Oct 28, 2022

1bbac1d was at fault. This was only introduced after the previous discussion in reaction to the failing tests here. However, other fixes to the "gnrc_sixlowpan_iphc: fix buffer overflow in gnrc_sixlowpan_iphc_recv()" commit, made that fix

  1. unnecessary
  2. introducing the error in tests/gcoap_fileserver and the release specs 6.6 test

As such, I just removed it.

@miri64
Copy link
Member Author

miri64 commented Oct 28, 2022

2. introducing the error in tests/gcoap_fileserver

(I was able to reproduce it after all btw)

@miri64
Copy link
Member Author

miri64 commented Oct 28, 2022

@miri64 miri64 disabled auto-merge October 28, 2022 23:11
@miri64 miri64 merged commit 5e9d627 into RIOT-OS:master Oct 29, 2022
@miri64
Copy link
Member Author

miri64 commented Oct 29, 2022

Release tests are run here: https://github.com/RIOT-OS/RIOT/actions/runs/3346308008/jobs/5548696437

Succeeded.

@miri64 miri64 deleted the gnrc_sixlowpan/fix/harden branch October 29, 2022 07:53
@miri64
Copy link
Member Author

miri64 commented Oct 29, 2022

Backport provided in #18820

@kaspar030 kaspar030 added this to the Release 2023.01 milestone Jan 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area: network Area: Networking Area: sys Area: System Area: tests Area: tests and testing framework CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR CI: run tests If set, CI server will run tests on hardware for the labeled PR Process: needs backport Integration Process: The PR is required to be backported to a release or feature branch Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants