Add LLVM KCFI support to the Rust compiler #105109

rcvalle · 2022-12-01T01:07:33Z

This PR adds LLVM Kernel Control Flow Integrity (KCFI) support to the Rust compiler. It initially provides forward-edge control flow protection for operating systems kernels for Rust-compiled code only by aggregating function pointers in groups identified by their return and parameter types. (See llvm/llvm-project@cff5bef.)

Forward-edge control flow protection for C or C++ and Rust -compiled code "mixed binaries" (i.e., for when C or C++ and Rust -compiled code share the same virtual address space) will be provided in later work as part of this project by identifying C char and integer type uses at the time types are encoded (see Type metadata in the design document in the tracking issue #89653).

LLVM KCFI can be enabled with -Zsanitizer=kcfi.

Thank you again, @bjorn3, @eddyb, @nagisa, and @ojeda, for all the help!

rustbot · 2022-12-01T01:07:42Z

r? @wesleywiser

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

rustbot · 2022-12-01T01:07:45Z

These commits modify compiler targets.
(See the Target Tier Policy.)

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo

rcvalle · 2022-12-01T02:50:50Z

I'll take a look at this fasthash build failure soon.

Cargo.lock

ojeda

Few trivial comments, though it looks fine to my untrained eyes.

compiler/rustc_symbol_mangling/src/typeid.rs

src/doc/unstable-book/src/compiler-flags/sanitizer.md

bjorn3 · 2022-12-02T11:29:12Z

You will need to add the new dependencies to the list at

rust/src/tools/tidy/src/deps.rs

Line 82 in 11663b1

const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[

rcvalle · 2022-12-02T17:56:08Z

You will need to add the new dependencies to the list at

rust/src/tools/tidy/src/deps.rs

Line 82 in 11663b1

const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[

That is what I was looking for! Thank you!

This commit adds initial documentation for LLVM Kernel Control Flow Integrity (KCFI) support to the Rust compiler (see rust-lang/rust#105109 and rust-lang/rust#89653).

This commit adds LLVM Kernel Control Flow Integrity (KCFI) support to the Rust compiler. It initially provides forward-edge control flow protection for operating systems kernels for Rust-compiled code only by aggregating function pointers in groups identified by their return and parameter types. (See llvm/llvm-project@cff5bef.) Forward-edge control flow protection for C or C++ and Rust -compiled code "mixed binaries" (i.e., for when C or C++ and Rust -compiled code share the same virtual address space) will be provided in later work as part of this project by identifying C char and integer type uses at the time types are encoded (see Type metadata in the design document in the tracking issue rust-lang#89653). LLVM KCFI can be enabled with -Zsanitizer=kcfi. Co-authored-by: bjorn3 <17426603+bjorn3@users.noreply.github.com>

This commit adds initial documentation for LLVM Kernel Control Flow Integrity (KCFI) support to the Rust compiler (see rust-lang#105109 and rust-lang#89653). Co-authored-by: Miguel Ojeda <ojeda@users.noreply.github.com>

bjorn3 · 2022-12-09T14:14:45Z

This is an unstable feature and is closely related to the (non-kernel) CFI work that was recently added without requiring an FCP. As such I think it is fine to land this without FCP too.

r? @bjorn3

@bors r+

bors · 2022-12-09T14:14:47Z

📌 Commit e1741ba has been approved by bjorn3

It is now in the queue for this repository.

…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#98391 (Reimplement std's thread parker on top of events on SGX) - rust-lang#104019 (Compute generator sizes with `-Zprint_type_sizes`) - rust-lang#104512 (Set `download-ci-llvm = "if-available"` by default when `channel = dev`) - rust-lang#104901 (Implement masking in FileType comparison on Unix) - rust-lang#105082 (Fix Async Generator ABI) - rust-lang#105109 (Add LLVM KCFI support to the Rust compiler) - rust-lang#105505 (Don't warn about unused parens when they are used by yeet expr) - rust-lang#105514 (Introduce `Span::is_visible`) - rust-lang#105516 (Update cargo) - rust-lang#105522 (Remove wrong note for short circuiting operators) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

This commit adds initial documentation for LLVM Kernel Control Flow Integrity (KCFI) support to the Rust compiler (see rust-lang/rust#105109 and rust-lang/rust#89653).

rcerc · 2023-01-02T17:20:56Z

compiler/rustc_target/src/spec/aarch64_unknown_none.rs


 pub fn target() -> Target {
    let opts = TargetOptions {
        linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes),
        linker: Some("rust-lld".into()),
        features: "+strict-align,+neon,+fp-armv8".into(),
+        supported_sanitizers: SanitizerSet::KCFI,


Should the aarch64-unknown-none-softfloat target also support KCFI?

Add LLVM KCFI support to the Rust compiler This PR adds LLVM Kernel Control Flow Integrity (KCFI) support to the Rust compiler. It initially provides forward-edge control flow protection for operating systems kernels for Rust-compiled code only by aggregating function pointers in groups identified by their return and parameter types. (See llvm/llvm-project@cff5bef.) Forward-edge control flow protection for C or C++ and Rust -compiled code "mixed binaries" (i.e., for when C or C++ and Rust -compiled code share the same virtual address space) will be provided in later work as part of this project by identifying C char and integer type uses at the time types are encoded (see Type metadata in the design document in the tracking issue rust-lang#89653). LLVM KCFI can be enabled with -Zsanitizer=kcfi. Thank you again, `@bjorn3,` `@eddyb,` `@nagisa,` and `@ojeda,` for all the help!

This commit adds initial documentation for LLVM Kernel Control Flow Integrity (KCFI) support to the Rust compiler (see rust-lang#105109 and rust-lang#89653).

This commit adds initial documentation for LLVM Kernel Control Flow Integrity (KCFI) support to the Rust compiler (see rust-lang/rust#105109 and rust-lang/rust#89653).

rustbot assigned wesleywiser Dec 1, 2022

rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc 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 Dec 1, 2022

rcvalle mentioned this pull request Dec 1, 2022

Tracking Issue for LLVM Control Flow Integrity (CFI) Support for Rust #89653

Open

6 tasks

This comment has been minimized.

Sign in to view

rcvalle force-pushed the rust-kcfi branch from 36aef06 to 7058ff7 Compare December 1, 2022 01:18

rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Dec 1, 2022

rcvalle force-pushed the rust-kcfi branch from 7058ff7 to 0183d8a Compare December 1, 2022 01:24

rcvalle force-pushed the rust-kcfi branch from 0183d8a to 24471e9 Compare December 1, 2022 01:27

This comment has been minimized.

Sign in to view

ojeda mentioned this pull request Dec 1, 2022

rustc wanted features & bugfixes Rust-for-Linux/linux#355

Open

52 tasks

bjorn3 reviewed Dec 1, 2022

View reviewed changes

Cargo.lock Outdated Show resolved Hide resolved

ojeda reviewed Dec 1, 2022

View reviewed changes

rcvalle force-pushed the rust-kcfi branch from 24471e9 to 9524eae Compare December 2, 2022 03:14

This comment has been minimized.

Sign in to view

rcvalle force-pushed the rust-kcfi branch from 321a5b1 to cc72580 Compare December 2, 2022 17:55

rcvalle force-pushed the rust-kcfi branch from cc72580 to c3fa623 Compare December 2, 2022 19:04

rcvalle force-pushed the rust-kcfi branch from bdbe960 to d8711c9 Compare December 9, 2022 00:41

rcvalle mentioned this pull request Dec 9, 2022

Add documentation for LLVM KCFI support rust-lang/rustc-dev-guide#1529

Merged

rcvalle force-pushed the rust-kcfi branch from d8711c9 to 3d0efdf Compare December 9, 2022 01:04

rcvalle and others added 2 commits December 8, 2022 17:24

Add documentation for LLVM KCFI support

e1741ba

This commit adds initial documentation for LLVM Kernel Control Flow Integrity (KCFI) support to the Rust compiler (see rust-lang#105109 and rust-lang#89653). Co-authored-by: Miguel Ojeda <ojeda@users.noreply.github.com>

rcvalle force-pushed the rust-kcfi branch from 3d0efdf to e1741ba Compare December 9, 2022 01:24

rustbot assigned bjorn3 and unassigned wesleywiser Dec 9, 2022

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 Dec 9, 2022

matthiaskrgr mentioned this pull request Dec 10, 2022

Rollup of 10 pull requests #105525

Merged

bors merged commit 947fe7e into rust-lang:master Dec 10, 2022

rustbot added this to the 1.68.0 milestone Dec 10, 2022

rcerc reviewed Jan 2, 2023

View reviewed changes

rcvalle added the PG-exploit-mitigations Project group: Exploit mitigations label Mar 13, 2023

rcvalle deleted the rust-kcfi branch May 22, 2023 17:54

bjorn3 mentioned this pull request Mar 26, 2024

CFI: Enable KCFI testing of run-pass tests #123024

Merged

rcvalle mentioned this pull request Apr 4, 2024

Tracking Issue for Kernel Control Flow Integrity (KCFI) Support for Rust #123479

Open

9 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add LLVM KCFI support to the Rust compiler #105109

Add LLVM KCFI support to the Rust compiler #105109

rcvalle commented Dec 1, 2022 •

edited

Loading

rustbot commented Dec 1, 2022

rustbot commented Dec 1, 2022

This comment has been minimized.

This comment has been minimized.

rcvalle commented Dec 1, 2022

ojeda left a comment

This comment has been minimized.

bjorn3 commented Dec 2, 2022

rcvalle commented Dec 2, 2022

bjorn3 commented Dec 9, 2022

bors commented Dec 9, 2022

rcerc Jan 2, 2023

Add LLVM KCFI support to the Rust compiler #105109

Add LLVM KCFI support to the Rust compiler #105109

Conversation

rcvalle commented Dec 1, 2022 • edited Loading

rustbot commented Dec 1, 2022

rustbot commented Dec 1, 2022

This comment has been minimized.

This comment has been minimized.

rcvalle commented Dec 1, 2022

ojeda left a comment

Choose a reason for hiding this comment

This comment has been minimized.

bjorn3 commented Dec 2, 2022

rcvalle commented Dec 2, 2022

bjorn3 commented Dec 9, 2022

bors commented Dec 9, 2022

rcerc Jan 2, 2023

Choose a reason for hiding this comment

rcvalle commented Dec 1, 2022 •

edited

Loading