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_frag_rb: fix OOB write in _rbuf_add #19680

Merged
merged 1 commit into from
May 30, 2023

Conversation

miri64
Copy link
Member

@miri64 miri64 commented May 30, 2023

Contribution description

See GHSA-f6ff-g7mh-58q4

Testing procedure

Issues/PRs references

@github-actions github-actions bot added Area: network Area: Networking Area: sys Area: System labels May 30, 2023
@miri64 miri64 added Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels May 30, 2023
@miri64 miri64 requested review from benpicco and fabian18 May 30, 2023 13:24
@riot-ci
Copy link

riot-ci commented May 30, 2023

Murdock results

✔️ PASSED

1aeb90e gnrc_sixlowpan_frag_rb: fix OOB write in _rbuf_add

Success Failures Total Runtime
6933 0 6933 12m:03s

Artifacts

if (frag_size > entry.super->datagram_size) {
DEBUG("6lo rfrag: fragment too big for resulting datagram, discarding datagram\n");
gnrc_pktbuf_release(entry.rbuf->pkt);
gnrc_pktbuf_release(pkt);
Copy link
Contributor

Choose a reason for hiding this comment

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

Not

Suggested change
gnrc_pktbuf_release(pkt);
gnrc_pktbuf_release_error(pkt, ENOMEM);

?

Copy link
Member Author

Choose a reason for hiding this comment

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

gnrc_pktbuf_release_error() isn't used at all in this module. Figures, since pkt is received, I don't think think there is much information gained here using that function.

@miri64 miri64 force-pushed the gnrc_sixlowpan_frag_rb/bug/oob-write branch from 20740af to 1aeb90e Compare May 30, 2023 14:44
@maribu
Copy link
Member

maribu commented May 30, 2023

bors merge

bors bot added a commit that referenced this pull request May 30, 2023
19610: drivers/periph/rtc: improve doc on rtc_set_alarm r=maribu a=maribu

### Contribution description

- point out behavior on denormalized time stamps
- use errno codes to indicate errors (and adapt the few instances of actual error handling to use them)


19670: cpu/stm32: stm32f4 BRR from BSRR r=maribu a=kfessel

### Contribution description

sometimes one wants to save one instruction :) 
just write the bits we need to write.

### Testing procedure

tests/periph/gpio_ll tests this 

### Issues/PRs references

`@maribu` might know some reference

maybe #19407

19678: gnrc_sixlowpan_iphc: fix NULL pointer dereference r=maribu a=miri64



19679: gnrc_sixlowpan_frag_sfr: fix ARQ scheduler race-condition r=maribu a=miri64



19680: gnrc_sixlowpan_frag_rb: fix OOB write in _rbuf_add r=maribu a=miri64



19681: sys/xtimer: improve documentation r=maribu a=maribu

### Contribution description

- Add a warning that xtimer is deprecated, so that new code hopefully starts using ztimer
- Add a hint that `ztimer_xtimer_compat` can be used even after `xtimer` is gone


Co-authored-by: Marian Buschsieweke <[email protected]>
Co-authored-by: Karl Fessel <[email protected]>
Co-authored-by: Martine Lenders <[email protected]>
@bors
Copy link
Contributor

bors bot commented May 30, 2023

This PR was included in a batch that was canceled, it will be automatically retried

@bors
Copy link
Contributor

bors bot commented May 30, 2023

Build succeeded!

The publicly hosted instance of bors-ng is deprecated and will go away soon.

If you want to self-host your own instance, instructions are here.
For more help, visit the forum.

If you want to switch to GitHub's built-in merge queue, visit their help page.

@bors bors bot merged commit 00b5bc1 into RIOT-OS:master May 30, 2023
@miri64 miri64 deleted the gnrc_sixlowpan_frag_rb/bug/oob-write branch May 30, 2023 20:30
@benpicco benpicco added this to the Release 2023.07 milestone Aug 2, 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 CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR 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.

4 participants