Skip to content

Conversation

rcvalle
Copy link
Member

@rcvalle rcvalle commented Nov 10, 2023

Adds missing use core::ffi::c_int for when sanitizer_cfi_normalize_integers is defined.

@rustbot
Copy link
Collaborator

rustbot commented Nov 10, 2023

r? @m-ou-se

(rustbot has picked a reviewer for you, use r? to override)

@rcvalle rcvalle added the PG-exploit-mitigations Project group: Exploit mitigations label Nov 10, 2023
@rust-log-analyzer

This comment has been minimized.

@rcvalle rcvalle force-pushed the rust-cfi-fix-000000 branch from d941c9b to f4b7632 Compare November 10, 2023 16:05
@rustbot rustbot added O-unix Operating system: Unix-like T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Nov 10, 2023
@rcvalle rcvalle force-pushed the rust-cfi-fix-000000 branch from f4b7632 to a4b0fcd Compare November 10, 2023 16:07
@rust-log-analyzer

This comment has been minimized.

@rcvalle rcvalle force-pushed the rust-cfi-fix-000000 branch from a4b0fcd to 8fcd7f9 Compare November 10, 2023 16:13
@rust-log-analyzer

This comment has been minimized.

Adds missing use core::ffi::c_int for when
sanitizer_cfi_normalize_integers is defined.
@rcvalle rcvalle force-pushed the rust-cfi-fix-000000 branch from 8fcd7f9 to 55e3dc4 Compare November 10, 2023 16:24
@rcvalle
Copy link
Member Author

rcvalle commented Nov 17, 2023

r? @workingjubilee

@rustbot rustbot assigned workingjubilee and unassigned m-ou-se Nov 17, 2023
@rcvalle
Copy link
Member Author

rcvalle commented Nov 17, 2023

@workingjubilee I missed this on #115200.

@workingjubilee
Copy link
Member

Ah, I see!
@bors r+

@bors
Copy link
Collaborator

bors commented Nov 21, 2023

📌 Commit 55e3dc4 has been approved by workingjubilee

It is now in the queue for this repository.

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 21, 2023
@workingjubilee
Copy link
Member

@bors rollup

bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 21, 2023
Rollup of 7 pull requests

Successful merges:

 - rust-lang#117790 (CFI: Add missing use core::ffi::c_int)
 - rust-lang#118059 (Explicitly unset $CARGO for compiletest)
 - rust-lang#118081 (`rustc_ty_utils` cleanups)
 - rust-lang#118094 (feat: specialize `SpecFromElem` for `()`)
 - rust-lang#118097 (Update books)
 - rust-lang#118115 (Fix occurrences of old fn names in comment and tracing)
 - rust-lang#118121 (`rustc_hir` cleanups)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 6bb671e into rust-lang:master Nov 21, 2023
@rustbot rustbot added this to the 1.76.0 milestone Nov 21, 2023
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Nov 21, 2023
Rollup merge of rust-lang#117790 - rcvalle:rust-cfi-fix-000000, r=workingjubilee

CFI: Add missing use core::ffi::c_int

Adds missing use core::ffi::c_int for when sanitizer_cfi_normalize_integers is defined.
@rcvalle rcvalle deleted the rust-cfi-fix-000000 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
O-unix Operating system: Unix-like 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-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants