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

KCFI: Use legal charset in shim encoding #123649

Merged
merged 1 commit into from Apr 9, 2024
Merged

Conversation

maurer
Copy link
Contributor

@maurer maurer commented Apr 8, 2024

To separate ReifyReason::FnPtr from ReifyReason::VTable, we hyphenated the shims. Hyphens are not actually legal, but underscores are, so use those instead.

r? @compiler-errors

To separate `ReifyReason::FnPtr` from `ReifyReason::VTable`, we
hyphenated the shims. Hyphens are not actually legal, but underscores
are, so use those instead.
@rustbot rustbot added PG-exploit-mitigations Project group: Exploit mitigations 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 Apr 8, 2024
@rustbot
Copy link
Collaborator

rustbot commented Apr 8, 2024

Some changes occurred in tests/ui/sanitizer

cc @rust-lang/project-exploit-mitigations, @rcvalle

@compiler-errors
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Apr 8, 2024

📌 Commit 233d94e has been approved by compiler-errors

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 Apr 8, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 9, 2024
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#122768 (Use the more informative generic type inference failure error on method calls on raw pointers)
 - rust-lang#123620 (sanitizers: Create the rustc_sanitizers crate)
 - rust-lang#123624 ([rustdoc] [GUI tests] Make theme switching closer to reality)
 - rust-lang#123636 (Update books)
 - rust-lang#123647 (rustdoc: slightly clean up the synthesis of blanket impls)
 - rust-lang#123648 (Avoid ICEing without the pattern_types feature gate)
 - rust-lang#123649 (KCFI: Use legal charset in shim encoding)
 - rust-lang#123652 (Fix UI tests with dist-vendored dependencies)
 - rust-lang#123655 (Remove unimplemented!() from BinOp::ty() function)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 55e0668 into rust-lang:master Apr 9, 2024
11 checks passed
@rustbot rustbot added this to the 1.79.0 milestone Apr 9, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 9, 2024
Rollup merge of rust-lang#123649 - maurer:kcfi-v0, r=compiler-errors

KCFI: Use legal charset in shim encoding

To separate `ReifyReason::FnPtr` from `ReifyReason::VTable`, we hyphenated the shims. Hyphens are not actually legal, but underscores are, so use those instead.

r? `@compiler-errors`
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.

None yet

4 participants