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.

Sign up for GitHub

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

Jump to bottom

Use random HashMap keys on Hermit #107387

Merged
merged 2 commits into from
Mar 30, 2023
Merged

Use random HashMap keys on Hermit #107387

merged 2 commits into from
Mar 30, 2023

Conversation

joboet
Copy link
Member

@joboet joboet commented Jan 27, 2023

Initializing the keys with random data provided by the libOS avoids HashDOS attacks and similar issues.

CC @stlankes

@rustbot
Copy link
Collaborator

rustbot commented Jan 27, 2023

r? @m-ou-se

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jan 27, 2023
@rustbot
Copy link
Collaborator

rustbot commented Jan 27, 2023

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

  • Stabilizing library features
  • Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
  • Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
  • Changing public documentation in ways that create new stability guarantees
  • Changing observable runtime behavior of library APIs

@bors
Copy link
Contributor

bors commented Feb 25, 2023

☔ The latest upstream changes (presumably #107405) made this pull request unmergeable. Please resolve the merge conflicts.

@stlankes
Copy link
Contributor

Thanks!!!

@ChrisDenton
Copy link
Member

To save me some time, do you have a link to the hermit docs at hand?

@mkroening
Copy link
Contributor

To save me some time, do you have a link to the hermit docs at hand?

Here you go: https://docs.rs/hermit-abi/latest/hermit_abi/fn.read_entropy.html

@ChrisDenton ChrisDenton assigned ChrisDenton and unassigned m-ou-se Mar 28, 2023
ChrisDenton
ChrisDenton reviewed Mar 28, 2023
View reviewed changes
Copy link
Member

@ChrisDenton ChrisDenton left a comment

Choose a reason for hiding this comment

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

This looks good to me. I just have one quick question but I'm otherwise happy to merge this.

@ChrisDenton
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Mar 29, 2023

📌 Commit f6bde03 has been approved by ChrisDenton

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 29, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 29, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 29, 2023
@bors
Auto merge of rust-lang#109734 - matthiaskrgr:rollup-oy4nlli, r=matth…
2fb0e8d 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#107387 (Use random `HashMap` keys on Hermit)
 - rust-lang#109511 (Make `EvalCtxt`'s `infcx` private)
 - rust-lang#109554 (Suggest ..= when someone tries to create an overflowing range)
 - rust-lang#109675 (Do not consider elaborated projection predicates for objects in new solver)
 - rust-lang#109693 (Remove ~const from alloc)
 - rust-lang#109700 (Lint against escape sequences in Fluent files)
 - rust-lang#109716 (Move `mir::Field` → `abi::FieldIdx`)
 - rust-lang#109726 (rustdoc: Don't strip crate module)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 57f1d11 into rust-lang:master Mar 30, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 30, 2023
@joboet joboet deleted the hermit_random branch March 30, 2023 05:13
@joboet joboet mentioned this pull request Mar 30, 2023
Closed
@stlankes stlankes mentioned this pull request Apr 9, 2023
Merged
bors bot added a commit to hermit-os/hermit-rs that referenced this pull request Apr 9, 2023
@bors @stlankes
Merge #414
4fee0e4 
414: switch to the latest nightly compiler r=stlankes a=stlankes

- the latest std library use random `HashMap` keys rust-lang/rust#107387
- fix typo in the creation of OpenOption for RustyHermit rust-lang/rust#109368

Co-authored-by: Stefan Lankes <[email protected]>
bors bot added a commit to hermit-os/hermit-rs that referenced this pull request Apr 9, 2023
@bors @stlankes
Merge #414
38afa50 
414: switch to the latest nightly compiler r=stlankes a=stlankes

- the latest std library use random `HashMap` keys rust-lang/rust#107387
- fix typo in the creation of OpenOption for RustyHermit rust-lang/rust#109368

Co-authored-by: Stefan Lankes <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ChrisDenton ChrisDenton ChrisDenton left review comments

Assignees

@ChrisDenton ChrisDenton

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.70.0
Development

Successfully merging this pull request may close these issues.
7 participants
@joboet @rustbot @bors @stlankes @ChrisDenton @mkroening @m-ou-se