Skip to content

CFI: Append debug location to CFI blocks - #132702

Merged
bors merged 1 commit into
rust-lang:masterfrom
1c3t3a:issue-132615
Nov 13, 2024
Merged

CFI: Append debug location to CFI blocks#132702
bors merged 1 commit into
rust-lang:masterfrom
1c3t3a:issue-132615

Conversation

@1c3t3a

@1c3t3a1c3t3a commented Nov 6, 2024•
edited
Loading

Copy link
Copy Markdown
Member

Currently we're not appending debug locations to the inserted CFI blocks. This shows up in #132615 and #100783. This change fixes that by passing down the debug location to the CFI type-test generation and appending it to the blocks.

Credits also belong to @jakos-sec who worked with me on this.

@rustbot

rustbot commented Nov 6, 2024

Copy link
Copy Markdown
Collaborator

r? @BoxyUwU

rustbot has assigned @BoxyUwU.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbotrustbot 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 Nov 6, 2024
@rustbot

rustbot commented Nov 6, 2024

Copy link
Copy Markdown
Collaborator

Some changes occurred in tests/codegen/sanitizer

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

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo, @GuillaumeGomez

1c3t3a
1c3t3a commented Nov 6, 2024
View reviewed changes
Comment threadcompiler/rustc_codegen_ssa/src/mir/debuginfo.rs Outdated
@1c3t3a

1c3t3a commented Nov 6, 2024•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

r? @rcvalle

@rustbotrustbot assigned rcvalle and unassigned BoxyUwUNov 6, 2024
@rcvalle

rcvalle commented Nov 6, 2024

Copy link
Copy Markdown
Member

Thank you for your time and for working on this, @1c3t3a ! Much appreciated.

Alternatively, this could be implemented by passing back/returning the blocks created by CFI to rustc_codegen_ssa if any, but I'm OK with this implementation. I think invoke and call need some refactoring (and possibly being consolidated into one) anyway, and from past conversations with @bjorn3 seemed to agree, and might be interested in providing feedback here. Otherwise; LGTM (FYI @cuviper).

@1c3t3a

1c3t3a commented Nov 7, 2024•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

but I'm OK with this implementation. I think invoke and call need some refactoring (and possibly being consolidated into one) anyway, and from past conversations with @bjorn3 seemed to agree, and might be interested in providing feedback here. Otherwise; LGTM (FYI @cuviper).

Another alternative would be to get the current debug information before appending the CFI blocks, remember it and append it to all inserted blocks. This would need to call LLVMGetCurrentDebugLocation2, which is currently not used by rustc. It would have the benefit that it doesn't need to change rustc_codegen_ssa's builder interface and it would keep all CFI logic inside rustc_codegen_llvm.

@rcvalle

rcvalle commented Nov 7, 2024

Copy link
Copy Markdown
Member

I think that would be preferred if you don't mind. You can add LLVMGetCurrentDebugLocation2 to rustc_llvm similarly to how LLVMRustIsNonGVFunctionPointerTy was added (also for CFI).

@1c3t3a
1c3t3aforce-pushed the issue-132615 branch 2 times, most recently from 9ea79fe to b5e4f5aCompareNovember 8, 2024 08:55
@1c3t3a

1c3t3a commented Nov 8, 2024

Copy link
Copy Markdown
MemberAuthor

I think that would be preferred if you don't mind. You can add LLVMGetCurrentDebugLocation2 to rustc_llvm similarly to how LLVMRustIsNonGVFunctionPointerTy was added (also for CFI).

Oke great! I updated the implementation accordingly :)

rcvalle
rcvalle reviewed Nov 8, 2024
View reviewed changes
Comment threadcompiler/rustc_codegen_llvm/src/debuginfo/mod.rs Outdated
rcvalle
rcvalle reviewed Nov 8, 2024
View reviewed changes
Comment threadtests/codegen/sanitizer/cfi/dbg-location-on-cfi-blocks.rs Outdated
@rcvalle

rcvalle commented Nov 8, 2024

Copy link
Copy Markdown
Member

Thank you very much, @1c3t3a! It looks great! I've just two comments I left that after resolved it LGTM (FYI, @cuviper).

@rcvalle

rcvalle commented Nov 12, 2024

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Nov 12, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit c210225 has been approved by rcvalle

It is now in the queue for this repository.

@borsbors 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 Nov 12, 2024
@matthiaskrgrmatthiaskrgr mentioned this pull request Nov 12, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 13, 2024
@bors
Auto merge ofrust-lang#132972- matthiaskrgr:rollup-456osr7, r=matth…
242f20d
…iaskrgr
Rollup of 7 pull requests
Successful merges:
- rust-lang#132702 (CFI: Append debug location to CFI blocks)
- rust-lang#132851 (Update the doc comment of `ASCII_CASE_MASK`)
- rust-lang#132948 (stabilize const_unicode_case_lookup)
- rust-lang#132950 (Use GNU ld on m68k-unknown-linux-gnu)
- rust-lang#132962 (triagebot: add codegen reviewers)
- rust-lang#132966 (stabilize const_option_ext)
- rust-lang#132970 (Add tracking issue number to unsigned_nonzero_div_ceil feature)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit bd79fe7 into rust-lang:masterNov 13, 2024
@rustbotrustbot added this to the 1.84.0 milestone Nov 13, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Nov 13, 2024
@rust-timer
Unrolled build forrust-lang#132702
22347b8
Rollup merge of rust-lang#132702 - 1c3t3a:issue-132615, r=rcvalle
CFI: Append debug location to CFI blocks
Currently we're not appending debug locations to the inserted CFI blocks. This shows up in rust-lang#132615 and rust-lang#100783. This change fixes that by passing down the debug location to the CFI type-test generation and appending it to the blocks.
Credits also belong to `@jakos-sec` who worked with me on this.
This was referenced Nov 15, 2024
Closed
Closed
antoyo pushed a commit to antoyo/rust that referenced this pull request Jan 13, 2025
@matthiaskrgr
Rollup merge ofrust-lang#132702- 1c3t3a:issue-132615, r=rcvalle
415c502
CFI: Append debug location to CFI blocks
Currently we're not appending debug locations to the inserted CFI blocks. This shows up in rust-lang#132615 and rust-lang#100783. This change fixes that by passing down the debug location to the CFI type-test generation and appending it to the blocks.
Credits also belong to `@jakos-sec` who worked with me on this.
@mcanouilmcanouil mentioned this pull request Apr 26, 2026
Closed
3 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rcvallercvallercvalle left review comments

Assignees

@rcvallercvalle

Labels

PG-exploit-mitigationsProject group: Exploit mitigationsS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.84.0

Development

Successfully merging this pull request may close these issues.

5 participants

@1c3t3a@rustbot@rcvalle@bors@BoxyUwU