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

Do not store synchronization primitive IDs in adressable memory #3966

Merged
merged 8 commits into from
Oct 14, 2024

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Oct 12, 2024

We shouldn't store this in a place where the program can mess with it.

Fixes #1649

Blocked by rust-lang/rust#131593

@RalfJung
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented Oct 12, 2024

📌 Commit d45d3a3 has been approved by RalfJung

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Oct 12, 2024

⌛ Testing commit d45d3a3 with merge 3880730...

bors added a commit that referenced this pull request Oct 12, 2024
Do not store synchronization primitive IDs in adressable memory

We shouldn't store this in a place where the program can mess with it.

Fixes #1649
@RalfJung
Copy link
Member Author

@bors r+ retry

@bors
Copy link
Contributor

bors commented Oct 12, 2024

📌 Commit 10979ce has been approved by RalfJung

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Oct 12, 2024

⌛ Testing commit 10979ce with merge 8180de7...

bors added a commit that referenced this pull request Oct 12, 2024
Do not store synchronization primitive IDs in adressable memory

We shouldn't store this in a place where the program can mess with it.

Fixes #1649
@RalfJung RalfJung added the S-blocked Status: blocked on something happening somewhere else label Oct 12, 2024
@RalfJung
Copy link
Member Author

@bors r-

Blocked by rust-lang/rust#131593

@bors
Copy link
Contributor

bors commented Oct 12, 2024

💔 Test failed - checks-actions

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 13, 2024
miri: avoid cloning AllocExtra

We shouldn't be cloning Miri allocations, so make `AllocExtra::clone` panic instead, and adjust the one case where we *do* clone (the leak check) to avoid cloning.

This is in preparation for rust-lang/miri#3966 where I am adding something to `AllocExtra` that cannot (easily) be cloned.

r? `@saethlin`
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 14, 2024
miri: avoid cloning AllocExtra

We shouldn't be cloning Miri allocations, so make `AllocExtra::clone` panic instead, and adjust the one case where we *do* clone (the leak check) to avoid cloning.

This is in preparation for rust-lang/miri#3966 where I am adding something to `AllocExtra` that cannot (easily) be cloned.

r? ``@saethlin``
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 14, 2024
Rollup merge of rust-lang#131593 - RalfJung:alloc-no-clone, r=saethlin

miri: avoid cloning AllocExtra

We shouldn't be cloning Miri allocations, so make `AllocExtra::clone` panic instead, and adjust the one case where we *do* clone (the leak check) to avoid cloning.

This is in preparation for rust-lang/miri#3966 where I am adding something to `AllocExtra` that cannot (easily) be cloned.

r? ``@saethlin``
RalfJung pushed a commit to RalfJung/miri that referenced this pull request Oct 14, 2024
miri: avoid cloning AllocExtra

We shouldn't be cloning Miri allocations, so make `AllocExtra::clone` panic instead, and adjust the one case where we *do* clone (the leak check) to avoid cloning.

This is in preparation for rust-lang#3966 where I am adding something to `AllocExtra` that cannot (easily) be cloned.

r? ``@saethlin``
@RalfJung
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented Oct 14, 2024

📌 Commit 323ab1c has been approved by RalfJung

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Oct 14, 2024

⌛ Testing commit 323ab1c with merge 1362c5f...

@bors
Copy link
Contributor

bors commented Oct 14, 2024

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing 1362c5f to master...

@bors bors merged commit 1362c5f into rust-lang:master Oct 14, 2024
8 checks passed
@RalfJung RalfJung deleted the dont-trust-the-user branch October 14, 2024 19:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-blocked Status: blocked on something happening somewhere else
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Posix mutex, rwlock & condvar store identifier index for miri in normal memory.
2 participants