Skip to content

Make -Zsanitizer-cfi-{recover,diag} require -Zsanitizer=cfi - #162193

Merged
rust-bors[bot] merged 3 commits into
rust-lang:mainfrom
jakos-sec:cfi-requires
Sep 12, 2026
Merged

Make -Zsanitizer-cfi-{recover,diag} require -Zsanitizer=cfi#162193
rust-bors[bot] merged 3 commits into
rust-lang:mainfrom
jakos-sec:cfi-requires

Conversation

@jakos-sec

@jakos-sec jakos-sec commented Sep 2, 2026

Copy link
Copy Markdown
Contributor

r? rcvalle

@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 Sep 2, 2026
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jakos-sec @1c3t3a
Make -Zsanitizer-cfi-{recover,diag} require -Zsanitizer=cfi
213dde3 
Co-Authored-By: Bastian Kersting <bkersting@google.com>
@rcvalle

rcvalle commented Sep 8, 2026

Copy link
Copy Markdown
Member

Would you mind adding tests for them similarly to https://github.com/rust-lang/rust/blob/main/tests/ui/sanitizer/cfi/generalize-pointers-requires-cfi.rs and https://github.com/rust-lang/rust/blob/main/tests/ui/sanitizer/cfi/normalize-integers-requires-cfi.rs?

rcvalle
rcvalle reviewed Sep 8, 2026
View reviewed changes
Comment thread compiler/rustc_session/src/session.rs Outdated
Comment thread compiler/rustc_session/src/session.rs Outdated
@rustbot

rustbot commented Sep 10, 2026

Copy link
Copy Markdown
Collaborator

Some changes occurred in tests/ui/sanitizer

cc @rcvalle

@rustbot rustbot added the PG-exploit-mitigations Project group: Exploit mitigations label Sep 10, 2026
@jakos-sec

jakos-sec commented Sep 10, 2026

Copy link
Copy Markdown
Contributor Author

Would you mind adding tests for them similarly to https://github.com/rust-lang/rust/blob/main/tests/ui/sanitizer/cfi/generalize-pointers-requires-cfi.rs and https://github.com/rust-lang/rust/blob/main/tests/ui/sanitizer/cfi/normalize-integers-requires-cfi.rs?

Done! Should be all there now :)

rcvalle
rcvalle reviewed Sep 10, 2026
View reviewed changes
Comment thread tests/ui/sanitizer/cfi/diag-requires-cfi.rs
@rcvalle

rcvalle commented Sep 11, 2026

Copy link
Copy Markdown
Member

@bors r+

@rust-bors

rust-bors Bot commented Sep 11, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 4fe5438 has been approved by rcvalle

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 Sep 11, 2026
@JonathanBrouwer JonathanBrouwer mentioned this pull request Sep 11, 2026
Merged
rust-bors Bot pushed a commit that referenced this pull request Sep 11, 2026
@bors
Auto merge of #162667 - JonathanBrouwer:rollup-gY1RAD0, r=JonathanBro…
8b82151 
…uwer

Rollup of 2 pull requests

Successful merges:

 - #161312 (libtest: Allow passing --test-threads and --color multiple times, with later arguments overriding earlier)
 - #162193 (Make -Zsanitizer-cfi-{recover,diag} require -Zsanitizer=cfi)
@rust-bors
rust-bors Bot merged commit 0470573 into rust-lang:main Sep 12, 2026
13 checks passed
@rustbot rustbot added this to the 1.100.0 milestone Sep 12, 2026
rust-bors Bot pushed a commit that referenced this pull request Sep 12, 2026
@bors
Unrolled build for #162193 in rollup 162667
a23128e 
Rollup merge of #162193 - jakos-sec:cfi-requires, r=rcvalle

Make -Zsanitizer-cfi-{recover,diag} require -Zsanitizer=cfi

r? rcvalle
@github-actions github-actions Bot mentioned this pull request Oct 2, 2026
Merged
@jakos-sec
jakos-sec deleted the cfi-requires branch October 9, 2026 14:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rcvalle rcvalle rcvalle left review comments

Assignees

@rcvalle rcvalle

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

Milestone

1.100.0

Development

Successfully merging this pull request may close these issues.

4 participants

@jakos-sec @rust-log-analyzer @rcvalle @rustbot