mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-22 23:04:33 +00:00
Rollup merge of #98998 - workingjubilee:naked-means-no-clothes-enforcement-technology, r=Amanieu
Remove branch target prologues from `#[naked] fn` This patch hacks around rust-lang/rust#98768 for now via injecting appropriate attributes into the LLVMIR we emit for naked functions. I intend to pursue this upstream so that these attributes can be removed in general, but it's slow going wading through C++ for me.
This commit is contained in:
commit
a027b01f33
@ -299,6 +299,12 @@ pub fn from_fn_attrs<'ll, 'tcx>(
|
||||
}
|
||||
if codegen_fn_attrs.flags.contains(CodegenFnAttrFlags::NAKED) {
|
||||
to_add.push(AttributeKind::Naked.create_attr(cx.llcx));
|
||||
// HACK(jubilee): "indirect branch tracking" works by attaching prologues to functions.
|
||||
// And it is a module-level attribute, so the alternative is pulling naked functions into new LLVM modules.
|
||||
// Otherwise LLVM's "naked" functions come with endbr prefixes per https://github.com/rust-lang/rust/issues/98768
|
||||
to_add.push(AttributeKind::NoCfCheck.create_attr(cx.llcx));
|
||||
// Need this for AArch64.
|
||||
to_add.push(llvm::CreateAttrStringValue(cx.llcx, "branch-target-enforcement", "false"));
|
||||
}
|
||||
if codegen_fn_attrs.flags.contains(CodegenFnAttrFlags::ALLOCATOR) {
|
||||
// apply to return place instead of function (unlike all other attributes applied in this function)
|
||||
|
@ -191,6 +191,7 @@ pub enum AttributeKind {
|
||||
StackProtect = 32,
|
||||
NoUndef = 33,
|
||||
SanitizeMemTag = 34,
|
||||
NoCfCheck = 35,
|
||||
}
|
||||
|
||||
/// LLVMIntPredicate
|
||||
|
@ -84,6 +84,7 @@ enum LLVMRustAttribute {
|
||||
StackProtect = 32,
|
||||
NoUndef = 33,
|
||||
SanitizeMemTag = 34,
|
||||
NoCfCheck = 35,
|
||||
};
|
||||
|
||||
typedef struct OpaqueRustString *RustStringRef;
|
||||
|
@ -176,6 +176,8 @@ static Attribute::AttrKind fromRust(LLVMRustAttribute Kind) {
|
||||
return Attribute::NoAlias;
|
||||
case NoCapture:
|
||||
return Attribute::NoCapture;
|
||||
case NoCfCheck:
|
||||
return Attribute::NoCfCheck;
|
||||
case NoInline:
|
||||
return Attribute::NoInline;
|
||||
case NonNull:
|
||||
|
21
src/test/assembly/aarch64-naked-fn-no-bti-prolog.rs
Normal file
21
src/test/assembly/aarch64-naked-fn-no-bti-prolog.rs
Normal file
@ -0,0 +1,21 @@
|
||||
// compile-flags: -C no-prepopulate-passes -Zbranch-protection=bti
|
||||
// assembly-output: emit-asm
|
||||
// needs-asm-support
|
||||
// only-aarch64
|
||||
|
||||
#![crate_type = "lib"]
|
||||
#![feature(naked_functions)]
|
||||
use std::arch::asm;
|
||||
|
||||
// The problem at hand: Rust has adopted a fairly strict meaning for "naked functions",
|
||||
// meaning "no prologue whatsoever, no, really, not one instruction."
|
||||
// Unfortunately, aarch64's "branch target identification" works via hints at landing sites.
|
||||
// LLVM implements this via making sure of that, even for functions with the naked attribute.
|
||||
// So, we must emit an appropriate instruction instead!
|
||||
#[no_mangle]
|
||||
#[naked]
|
||||
pub unsafe extern "C" fn _hlt() -> ! {
|
||||
// CHECK-NOT: hint #34
|
||||
// CHECK: hlt #0x1
|
||||
asm!("hlt #1", options(noreturn))
|
||||
}
|
24
src/test/assembly/x86_64-naked-fn-no-cet-prolog.rs
Normal file
24
src/test/assembly/x86_64-naked-fn-no-cet-prolog.rs
Normal file
@ -0,0 +1,24 @@
|
||||
// compile-flags: -C no-prepopulate-passes -Zcf-protection=full
|
||||
// assembly-output: emit-asm
|
||||
// needs-asm-support
|
||||
// only-x86_64
|
||||
|
||||
#![crate_type = "lib"]
|
||||
#![feature(naked_functions)]
|
||||
use std::arch::asm;
|
||||
|
||||
// The problem at hand: Rust has adopted a fairly strict meaning for "naked functions",
|
||||
// meaning "no prologue whatsoever, no, really, not one instruction."
|
||||
// Unfortunately, x86's control-flow enforcement, specifically indirect branch protection,
|
||||
// works by using an instruction for each possible landing site,
|
||||
// and LLVM implements this via making sure of that.
|
||||
#[no_mangle]
|
||||
#[naked]
|
||||
pub unsafe extern "sysv64" fn will_halt() -> ! {
|
||||
// CHECK-NOT: endbr{{32|64}}
|
||||
// CHECK: hlt
|
||||
asm!("hlt", options(noreturn))
|
||||
}
|
||||
|
||||
// what about aarch64?
|
||||
// "branch-protection"=false
|
@ -28,4 +28,4 @@ pub unsafe fn g() {
|
||||
f();
|
||||
}
|
||||
|
||||
// CHECK: attributes [[ATTR]] = { naked noinline{{.*}} }
|
||||
// CHECK: attributes [[ATTR]] = { naked{{.*}}noinline{{.*}} }
|
||||
|
Loading…
Reference in New Issue
Block a user