Skip to content

Improve soundness of rustc_data_structures - #97707

Merged
bors merged 2 commits into
rust-lang:masterfrom
Noratrieb:data-structures-ub
Jun 5, 2022
Merged

Improve soundness of rustc_data_structures#97707
bors merged 2 commits into
rust-lang:masterfrom
Noratrieb:data-structures-ub

Conversation

@Noratrieb

@NoratriebNoratrieb commented Jun 3, 2022

Copy link
Copy Markdown
Member

Make it runnable in miri by adding some ignores and changing N in miri. Also fix a stacked borrows issue in sip128.

@rustbotrustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jun 3, 2022
@rust-highfive

rust-highfive commented Jun 3, 2022

Copy link
Copy Markdown
Contributor

r? @cjgillot

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 3, 2022
@cjgillot

cjgillot commented Jun 4, 2022

Copy link
Copy Markdown
Contributor

Thanks @Nilstrieb. I'm not sure the title accurately represents the PR. I'd go for "Make rustc_data_structures testable through miri."
r=me after that.

@Noratrieb

Noratrieb commented Jun 4, 2022

Copy link
Copy Markdown
MemberAuthor

It also makes a soundness fix in the second commit, so I think it's more accurate. But I can change it it if you want.

@cjgillot

cjgillot commented Jun 4, 2022

Copy link
Copy Markdown
Contributor

Ok. The commit messages are clear enough anyway.
@bors r+ rollup

@bors

bors commented Jun 4, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit e869dce8230e6779a0305fd3f393611b7a263fd9 has been approved by cjgillot

@borsbors 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 Jun 4, 2022
RalfJung
RalfJung reviewed Jun 4, 2022
View reviewed changes
Comment threadcompiler/rustc_data_structures/src/base_n/tests.rs Outdated
@Noratrieb
Noratriebforce-pushed the data-structures-ub branch from e869dce to 9fef644CompareJune 4, 2022 15:32
@Noratrieb

Noratrieb commented Jun 4, 2022

Copy link
Copy Markdown
MemberAuthor

@cjgillot I was able to run an additional test in miri by reducing the number thanks to Ralf, can you approve it again?

@RalfJung

RalfJung commented Jun 4, 2022

Copy link
Copy Markdown
Member

@bors r=cjgillot

@bors

bors commented Jun 4, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 9fef644e7e5a5ded13ffefc35e80500c5769badd has been approved by cjgillot

@Noratrieb
Adapt rustc_data_structures tests to run in strict miri
fc8b13c
Some tests took too long and owning_ref is fundamentally flawed,
so don't run these tests or run them with a shorter N. This makes
miri with `-Zmiri-strict-provenance` usable to find UB.
@Noratrieb
Fix stacked borrows invalidation in rustc_data_structures sip128
7e3bee6
It creates the src pointer first, which is then invalidated by a
unique borrow of the destination pointer. Swap the borrows around
to fix this. Found with miri.
@Noratrieb
Noratriebforce-pushed the data-structures-ub branch from 9fef644 to 7e3bee6CompareJune 4, 2022 15:47
@Noratrieb

Noratrieb commented Jun 4, 2022

Copy link
Copy Markdown
MemberAuthor

You have to approve that again, I fucked up my formatting :)

@RalfJung

RalfJung commented Jun 4, 2022

Copy link
Copy Markdown
Member

@bors r=cjgillot

@bors

bors commented Jun 4, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 7e3bee6 has been approved by cjgillot

@matthiaskrgrmatthiaskrgr mentioned this pull request Jun 4, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 4, 2022
@bors
Auto merge ofrust-lang#97742- matthiaskrgr:rollup-fr3j0t8, r=matthi…
43874a2
…askrgr
Rollup of 6 pull requests
Successful merges:
- rust-lang#97609 (Iterate over `maybe_unused_trait_imports` when checking dead trait imports)
- rust-lang#97688 (test const_copy to make sure bytewise pointer copies are working)
- rust-lang#97707 (Improve soundness of rustc_data_structures)
- rust-lang#97731 (Add regresion test for rust-lang#87142)
- rust-lang#97735 (Don't generate "Impls on Foreign Types" for std)
- rust-lang#97737 (Fix pretty printing named bound regions under -Zverbose)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 0145321 into rust-lang:masterJun 5, 2022
@rustbotrustbot added this to the 1.63.0 milestone Jun 5, 2022
@Noratrieb
Noratrieb deleted the data-structures-ub branch June 5, 2022 07:17
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@RalfJungRalfJungRalfJung left review comments

Assignees

@cjgillotcjgillot

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.63.0

Development

Successfully merging this pull request may close these issues.

6 participants

@Noratrieb@rust-highfive@cjgillot@bors@RalfJung@rustbot