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

CFI: Fix SIGILL reached via trait objects #111375

Merged
merged 1 commit into from
May 12, 2023

Conversation

rcvalle
Copy link
Member

@rcvalle rcvalle commented May 8, 2023

Fix #106547 by transforming the concrete self into a reference to a trait object before emitting type metadata identifiers for trait methods.

@rustbot
Copy link
Collaborator

rustbot commented May 8, 2023

r? @lcnr

(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-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels May 8, 2023
@rcvalle
Copy link
Member Author

rcvalle commented May 8, 2023

CC @maurer

@rcvalle
Copy link
Member Author

rcvalle commented May 8, 2023

r? @bjorn3

@rustbot rustbot assigned bjorn3 and unassigned lcnr May 8, 2023
@rust-log-analyzer

This comment has been minimized.

@rcvalle rcvalle force-pushed the rust-cfi-fix-106547 branch from bb90480 to 030098a Compare May 8, 2023 23:26
@rust-log-analyzer

This comment has been minimized.

@rcvalle rcvalle force-pushed the rust-cfi-fix-106547 branch from 030098a to f6d078b Compare May 9, 2023 04:07
@rust-log-analyzer

This comment has been minimized.

@rcvalle rcvalle force-pushed the rust-cfi-fix-106547 branch from f6d078b to 7740b8d Compare May 9, 2023 04:55
@rust-log-analyzer

This comment has been minimized.

@rcvalle rcvalle force-pushed the rust-cfi-fix-106547 branch from 7740b8d to 7e0b6b8 Compare May 9, 2023 05:23
@rcvalle rcvalle added the PG-exploit-mitigations Project group: Exploit mitigations label May 9, 2023
@rcvalle rcvalle force-pushed the rust-cfi-fix-106547 branch from 7e0b6b8 to a344391 Compare May 9, 2023 18:26
@rust-log-analyzer

This comment has been minimized.

@rcvalle rcvalle force-pushed the rust-cfi-fix-106547 branch from a344391 to 7fc555c Compare May 9, 2023 18:55
@rust-log-analyzer

This comment has been minimized.

Fix rust-lang#106547 by transforming the concrete self into a reference to a
trait object before emitting type metadata identifiers for trait
methods.
@rcvalle rcvalle force-pushed the rust-cfi-fix-106547 branch from 7fc555c to 7c7b22e Compare May 9, 2023 20:04
@bjorn3
Copy link
Member

bjorn3 commented May 11, 2023

@bors r+

@bors
Copy link
Contributor

bors commented May 11, 2023

📌 Commit 7c7b22e has been approved by bjorn3

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 May 11, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request May 12, 2023
…mpiler-errors

Rollup of 7 pull requests

Successful merges:

 - rust-lang#106038 (use implied bounds when checking opaque types)
 - rust-lang#111366 (Make `NonUseContext::AscribeUserTy` carry `ty::Variance`)
 - rust-lang#111375 (CFI: Fix SIGILL reached via trait objects)
 - rust-lang#111439 (Fix backtrace normalization in ice-bug-report-url.rs)
 - rust-lang#111444 (Only warn single-use lifetime when the binders match.)
 - rust-lang#111459 (Update browser-ui-test version to 0.16.0)
 - rust-lang#111460 (Improve suggestion for `self: Box<self>`)

Failed merges:

 - rust-lang#110454 (Require impl Trait in associated types to appear in method signatures)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 691a5f3 into rust-lang:master May 12, 2023
@rustbot rustbot added this to the 1.71.0 milestone May 12, 2023
@rcvalle rcvalle deleted the rust-cfi-fix-106547 branch April 22, 2024 23:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PG-exploit-mitigations Project group: Exploit mitigations S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CFI: SIGILL reached via trait objects
6 participants