bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #129891 - nikic:naked-no-san, r=jackh726

Browse source 
Do not request sanitizers for naked functions

Naked functions can only contain inline asm, so any instrumentation inserted by sanitizers is illegal. Don't request it.

Fixes https://github.com/rust-lang/rust/issues/129224.
This commit is contained in:
Michael Goulet 2024-09-07 14:21:21 +03:00 • committed by GitHub
commit 6dd07e4e26
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 47 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_codegen_llvm/src/attributes.rs
View file

@ -411,7 +411,11 @@ pub(crate) fn llfn_attrs_from_instance<'ll, 'tcx>(
// the string "false". Now it is disabled by absence of the attribute. // the string "false". Now it is disabled by absence of the attribute.
to_add.push(llvm::CreateAttrStringValue(cx.llcx, "branch-target-enforcement", "false")); to_add.push(llvm::CreateAttrStringValue(cx.llcx, "branch-target-enforcement", "false"));
} }
} else if llvm_util::get_version() >= (19, 0, 0) { } else {
// Do not set sanitizer attributes for naked functions.
to_add.extend(sanitize_attrs(cx, codegen_fn_attrs.no_sanitize));
if llvm_util::get_version() >= (19, 0, 0) {
// For non-naked functions, set branch protection attributes on aarch64. // For non-naked functions, set branch protection attributes on aarch64.
if let Some(BranchProtection { bti, pac_ret }) = if let Some(BranchProtection { bti, pac_ret }) =
cx.sess().opts.unstable_opts.branch_protection cx.sess().opts.unstable_opts.branch_protection
@ -434,6 +438,7 @@ pub(crate) fn llfn_attrs_from_instance<'ll, 'tcx>(
} }
} }
} }
}
if codegen_fn_attrs.flags.contains(CodegenFnAttrFlags::ALLOCATOR) if codegen_fn_attrs.flags.contains(CodegenFnAttrFlags::ALLOCATOR)
|| codegen_fn_attrs.flags.contains(CodegenFnAttrFlags::ALLOCATOR_ZEROED) || codegen_fn_attrs.flags.contains(CodegenFnAttrFlags::ALLOCATOR_ZEROED)
{ {
@ -485,7 +490,6 @@ pub(crate) fn llfn_attrs_from_instance<'ll, 'tcx>(
if let Some(backchain) = backchain_attr(cx) { if let Some(backchain) = backchain_attr(cx) {
to_add.push(backchain); to_add.push(backchain);
} }
to_add.extend(sanitize_attrs(cx, codegen_fn_attrs.no_sanitize));
to_add.extend(patchable_function_entry_attrs(cx, codegen_fn_attrs.patchable_function_entry)); to_add.extend(patchable_function_entry_attrs(cx, codegen_fn_attrs.patchable_function_entry));
// Always annotate functions with the target-cpu they are compiled for. // Always annotate functions with the target-cpu they are compiled for.

22
tests/codegen/naked-asan.rs Normal file
View file

@ -0,0 +1,22 @@
// Make sure we do not request sanitizers for naked functions.
//@ only-x86_64
//@ needs-sanitizer-address
//@ compile-flags: -Zsanitizer=address -Ctarget-feature=-crt-static
#![crate_type = "lib"]
#![no_std]
#![feature(abi_x86_interrupt, naked_functions)]
// CHECK: define x86_intrcc void @page_fault_handler(ptr {{.*}}%0, i64 {{.*}}%1){{.*}}#[[ATTRS:[0-9]+]] {
// CHECK-NOT: memcpy
#[naked]
#[no_mangle]
pub extern "x86-interrupt" fn page_fault_handler(_: u64, _: u64) {
unsafe {
core::arch::asm!("ud2", options(noreturn));
}
}
// CHECK: #[[ATTRS]] =
// CHECK-NOT: sanitize_address