CFI: Fix fn items, closures, and Fn trait objects, and more by rcvalle · Pull Request #116404 · rust-lang/rust

rcvalle · 2023-10-03T22:24:31Z

This PR:

Finishes adding CFI support to the Rust Standard Library (i.e., programs build and run using the Cargo build-std feature, and all Rust Standard Library tests pass). (ResolvesCFI: core and std have explict CFI violations #115199.)
Fixes casting between function items, closures, and Fn trait objects by transforming function items, closures, and Fn trait objects into function pointers for encoding.
Fixes drop and drop_in_place by transforming self of drop and drop_in_place methods into a Drop trait object and handling drop method calls separatedly (and also transforming self into a Drop trait object). This has the same effect of what CFI does for impl methods by transforming self into trait objects that match the trait objects in the calls after type erasure.
FixesICE: cfi: encode_ty: unexpected 'CoroutineWitness' #122705 by adding support for encoding ty:CoroutineClosure.
Fix casting between methods and function pointers by assigning a secondary type id to methods with their concrete self so they can be used as function pointers. (FixCFI breaks on trait Address Taken functions #115953 and resolvescfi: Store type erasure witness for Argument #115954.)

This is a zero cost solution for both the Rust compiler and compiled programs (i.e., without generating any shims/trampolines or changing the compiler code generation at all) for the issues described and solutions proposed in #121962 and #122573.

rustbot · 2023-10-03T22:24:39Z

r? @oli-obk

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

rcvalle · 2023-10-03T22:25:16Z

r? @compiler-errors

bors · 2023-10-11T09:12:52Z

☔ The latest upstream changes (presumably #115948) made this pull request unmergeable. Please resolve the merge conflicts.

rustbot · 2023-10-24T20:49:48Z

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

compiler-errors · 2023-10-25T15:19:30Z

One nit @rustbot author

rcvalle · 2023-10-26T17:26:10Z

@rustbot label -S-waiting-on-author +S-waiting-on-review

bors · 2023-11-16T15:53:35Z

☔ The latest upstream changes (presumably #117875) made this pull request unmergeable. Please resolve the merge conflicts.

Fix casting between function items, closures, and Fn trait objects by transforming function items, closures, and Fn trait objects into function pointers for encoding.

Fix drop and drop_in_place by transforming self of drop and drop_in_place methods into a Drop trait object and handling drop method calls separatedly (and also transforming self into a Drop trait object). This has the same effect of what CFI does for impl methods by transforming self into trait objects that match the trait objects in the calls after type erasure.

Fixrust-lang#122705 by adding support for encoding `ty:CoroutineClosure`.

This reverts commit f2f0d25.

Fix casting between methods and function pointers by assigning a secondary type id to methods with their concrete self so they can be used as function pointers.

bors · 2024-03-24T11:37:53Z

☔ The latest upstream changes (presumably #122980) made this pull request unmergeable. Please resolve the merge conflicts.

compiler-errors · 2024-03-25T16:56:49Z

Given that this PR is doing like 5+ different things, I'd like to see this broken up into several different PRs to be honest.

Like, there's no reason why the PR which changes coroutine encoding needs to go into the same PR which changes the way we encode the receiver for Drop.

rcvalle · 2024-03-25T16:59:52Z

Given that this PR is doing like 5+ different things, I'd like to see this broken up into several different PRs to be honest.
Like, there's no reason why the PR which changes coroutine encoding needs to go into the same PR which changes the way we encode the receiver for Drop.

Sure. I'll split it into smaller self-contained PRs.

…place, r=compiler-errors CFI: Fix drop and drop_in_place Fix drop and drop_in_place by transforming self of drop and drop_in_place methods into a Drop trait objects. This was split off from rust-lang#116404. cc `@compiler-errors` `@workingjubilee`

Rollup merge of rust-lang#123075 - rcvalle:rust-cfi-fix-drop-drop-in-place, r=compiler-errors CFI: Fix drop and drop_in_place Fix drop and drop_in_place by transforming self of drop and drop_in_place methods into a Drop trait objects. This was split off from rust-lang#116404. cc `@compiler-errors` `@workingjubilee`

…ast, r=compiler-errors CFI: Fix methods as function pointer cast Fix casting between methods and function pointers by assigning a secondary type id to methods with their concrete self so they can be used as function pointers. This was split off from rust-lang#116404. cc `@compiler-errors` `@workingjubilee`

Jules-Bertholet · 2024-04-08T04:10:49Z

@rustbot label A-sanitizers

Dylan-DPC · 2024-04-08T10:59:22Z

Closing this as it's being split into multiple prs

rustbot assigned oli-obk Oct 3, 2023

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 Oct 3, 2023

rcvalle added the PG-exploit-mitigations Project group: Exploit mitigations label Oct 3, 2023

rustbot assigned compiler-errors and unassigned oli-obk Oct 3, 2023

rcvalle force-pushed the rust-cfi-fix-115199-3 branch from 5157709 to 256cab2Compare October 3, 2023 22:58

This comment has been minimized.
Sign in to view

rcvalle force-pushed the rust-cfi-fix-115199-3 branch from 256cab2 to a25171bCompare October 3, 2023 23:27

rcvalle mentioned this pull request Oct 4, 2023
Disable CFI for core and std CFI violations #115200
Merged

rcvalle force-pushed the rust-cfi-fix-115199-3 branch from a25171b to d676343Compare October 24, 2023 20:49

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

rcvalle force-pushed the rust-cfi-fix-115199-3 branch from d676343 to df8c3a8Compare October 24, 2023 20:59

compiler-errors reviewed Oct 25, 2023
View reviewed changes

Comment threadcompiler/rustc_middle/src/ty/sty.rs Outdated

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 25, 2023

rcvalle force-pushed the rust-cfi-fix-115199-3 branch from df8c3a8 to dd04959Compare October 25, 2023 19:54

compiler-errors reviewed Oct 25, 2023
View reviewed changes

Comment threadcompiler/rustc_middle/src/ty/sty.rs Outdated

rcvalle force-pushed the rust-cfi-fix-115199-3 branch 3 times, most recently from d5b79c1 to 3e28128Compare October 26, 2023 16:39

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 26, 2023

rcvalle force-pushed the rust-cfi-fix-115199-3 branch 3 times, most recently from bc7ae20 to 6f146f5Compare March 22, 2024 21:06

This comment has been minimized.
Sign in to view

rcvalle force-pushed the rust-cfi-fix-115199-3 branch from 4abea48 to f28ac45Compare March 22, 2024 23:08

rcvalle added 5 commits March 22, 2024 17:45

CFI: Fix fn items, closures, and Fn trait objects
e301a29
Fix casting between function items, closures, and Fn trait objects by transforming function items, closures, and Fn trait objects into function pointers for encoding.

CFI: Fix encode_ty: unexpected 'CoroutineWitness'
56cf23c
Fixrust-lang#122705 by adding support for encoding `ty:CoroutineClosure`.

Revert "CFI: Skip non-passed arguments"
cbcb16d
This reverts commit f2f0d25.

CFI: Fix methods as function pointer cast
66b2708
Fix casting between methods and function pointers by assigning a secondary type id to methods with their concrete self so they can be used as function pointers.

rcvalle force-pushed the rust-cfi-fix-115199-3 branch from f28ac45 to 66b2708Compare March 23, 2024 00:52

compiler-errors mentioned this pull request Mar 25, 2024
Recursively transform predicates in ty::Dynamic rather than using identity #123045
Closed

This was referenced Mar 26, 2024
CFI: Fix methods as function pointer cast #123071
Merged
CFI: Fix drop and drop_in_place #123075
Merged
CFI: Fix fn items, closures, and Fn trait objects #123082
Draft

This was referenced Mar 29, 2024
Revert "CFI: Skip non-passed arguments" #123205
Draft
Tracking Issue for Kernel Control Flow Integrity (KCFI) Support for Rust #123479
Open

rustbot added the A-sanitizers Area: Sanitizers for correctness and code quality label Apr 8, 2024

Dylan-DPC closed this Apr 8, 2024

rcvalle deleted the rust-cfi-fix-115199-3 branch April 22, 2024 23:07

rcvalle restored the rust-cfi-fix-115199-3 branch April 22, 2024 23:07

Uh oh!

Uh oh!

Conversation

rcvalle commented Oct 3, 2023• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Oct 3, 2023

Uh oh!

rcvalle commented Oct 3, 2023

Uh oh!

This comment has been minimized.

bors commented Oct 11, 2023

Uh oh!

rustbot commented Oct 24, 2023

Uh oh!

Uh oh!

compiler-errors commented Oct 25, 2023

Uh oh!

Uh oh!

rcvalle commented Oct 26, 2023

Uh oh!

bors commented Nov 16, 2023

Uh oh!

This comment has been minimized.

bors commented Mar 24, 2024

Uh oh!

compiler-errors commented Mar 25, 2024

Uh oh!

rcvalle commented Mar 25, 2024

Uh oh!

Jules-Bertholet commented Apr 8, 2024

Uh oh!

Dylan-DPC commented Apr 8, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

rcvalle commented Oct 3, 2023•
edited
Loading