bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

linker: Use data execution prevention options by default when linker supports them

Browse source
This commit is contained in:
Vadim Petrochenkov 2021-03-28 23:18:39 +03:00
parent 4a20eb6a9d
commit cc5392e76b
11 changed files with 23 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/rustc_target/src/spec/dragonfly_base.rs
View file

@ -1,15 +1,6 @@
use crate::spec::{LinkArgs, LinkerFlavor, RelroLevel, TargetOptions};
use crate::spec::{RelroLevel, TargetOptions};
pub fn opts() -> TargetOptions {
let mut args = LinkArgs::new();
args.insert(
LinkerFlavor::Gcc,
vec![
// Always enable NX protection when it is available
"-Wl,-z,noexecstack".to_string(),
],
);
TargetOptions {
os: "dragonfly".to_string(),
dynamic_linking: true,
@ -17,7 +8,6 @@ pub fn opts() -> TargetOptions {
os_family: Some("unix".to_string()),
linker_is_gnu: true,
has_rpath: true,
pre_link_args: args,
position_independent_executables: true,
relro_level: RelroLevel::Full,
dwarf_version: Some(2),

12
compiler/rustc_target/src/spec/freebsd_base.rs
View file

@ -1,15 +1,6 @@
use crate::spec::{LinkArgs, LinkerFlavor, RelroLevel, TargetOptions};
use crate::spec::{RelroLevel, TargetOptions};
pub fn opts() -> TargetOptions {
let mut args = LinkArgs::new();
args.insert(
LinkerFlavor::Gcc,
vec![
// Always enable NX protection when it is available
"-Wl,-z,noexecstack".to_string(),
],
);
TargetOptions {
os: "freebsd".to_string(),
dynamic_linking: true,
@ -17,7 +8,6 @@ pub fn opts() -> TargetOptions {
os_family: Some("unix".to_string()),
linker_is_gnu: true,
has_rpath: true,
pre_link_args: args,
position_independent_executables: true,
eliminate_frame_pointer: false, // FIXME 43575
relro_level: RelroLevel::Full,

12
compiler/rustc_target/src/spec/linux_base.rs
View file

@ -1,15 +1,6 @@
use crate::spec::{LinkArgs, LinkerFlavor, RelroLevel, TargetOptions};
use crate::spec::{RelroLevel, TargetOptions};
pub fn opts() -> TargetOptions {
let mut args = LinkArgs::new();
args.insert(
LinkerFlavor::Gcc,
vec![
// Always enable NX protection when it is available
"-Wl,-z,noexecstack".to_string(),
],
);
TargetOptions {
os: "linux".to_string(),
dynamic_linking: true,
@ -17,7 +8,6 @@ pub fn opts() -> TargetOptions {
os_family: Some("unix".to_string()),
linker_is_gnu: true,
has_rpath: true,
pre_link_args: args,
position_independent_executables: true,
relro_level: RelroLevel::Full,
has_elf_tls: true,

8
compiler/rustc_target/src/spec/linux_kernel_base.rs
View file

@ -1,11 +1,6 @@
use crate::spec::{
LinkArgs, LinkerFlavor, PanicStrategy, RelocModel, RelroLevel, StackProbeType, TargetOptions,
};
use crate::spec::{PanicStrategy, RelocModel, RelroLevel, StackProbeType, TargetOptions};
pub fn opts() -> TargetOptions {
let mut pre_link_args = LinkArgs::new();
pre_link_args.insert(LinkerFlavor::Gcc, vec!["-Wl,-z,noexecstack".to_string()]);
TargetOptions {
env: "gnu".to_string(),
disable_redzone: true,
@ -17,7 +12,6 @@ pub fn opts() -> TargetOptions {
needs_plt: true,
relro_level: RelroLevel::Full,
relocation_model: RelocModel::Static,
pre_link_args,
..Default::default()
}

7
compiler/rustc_target/src/spec/msvc_base.rs
View file

@ -5,13 +5,6 @@ pub fn opts() -> TargetOptions {
// Suppress the verbose logo and authorship debugging output, which would needlessly
// clog any log files.
"/NOLOGO".to_string(),
// Tell the compiler that non-code sections can be marked as non-executable,
// including stack pages.
// UEFI is fully compatible to non-executable data pages.
// In fact, firmware might enforce this, so we better let the linker know about this,
// so it will fail if the compiler ever tries placing code on the stack
// (e.g., trampoline constructs and alike).
"/NXCOMPAT".to_string(),
];
let mut pre_link_args = LinkArgs::new();
pre_link_args.insert(LinkerFlavor::Msvc, pre_link_args_msvc.clone());

12
compiler/rustc_target/src/spec/openbsd_base.rs
View file

@ -1,15 +1,6 @@
use crate::spec::{LinkArgs, LinkerFlavor, RelroLevel, TargetOptions};
use crate::spec::{RelroLevel, TargetOptions};
pub fn opts() -> TargetOptions {
let mut args = LinkArgs::new();
args.insert(
LinkerFlavor::Gcc,
vec![
// Always enable NX protection when it is available
"-Wl,-z,noexecstack".to_string(),
],
);
TargetOptions {
os: "openbsd".to_string(),
dynamic_linking: true,
@ -18,7 +9,6 @@ pub fn opts() -> TargetOptions {
linker_is_gnu: true,
has_rpath: true,
abi_return_struct_as_int: true,
pre_link_args: args,
position_independent_executables: true,
eliminate_frame_pointer: false, // FIXME 43575
relro_level: RelroLevel::Full,

12
compiler/rustc_target/src/spec/redox_base.rs
View file

@ -1,15 +1,6 @@
use crate::spec::{LinkArgs, LinkerFlavor, RelroLevel, TargetOptions};
use crate::spec::{RelroLevel, TargetOptions};
pub fn opts() -> TargetOptions {
let mut args = LinkArgs::new();
args.insert(
LinkerFlavor::Gcc,
vec![
// Always enable NX protection when it is available
"-Wl,-z,noexecstack".to_string(),
],
);
TargetOptions {
os: "redox".to_string(),
env: "relibc".to_string(),
@ -18,7 +9,6 @@ pub fn opts() -> TargetOptions {
os_family: Some("unix".to_string()),
linker_is_gnu: true,
has_rpath: true,
pre_link_args: args,
position_independent_executables: true,
relro_level: RelroLevel::Full,
has_elf_tls: true,

2
compiler/rustc_target/src/spec/windows_gnu_base.rs
View file

@ -9,8 +9,6 @@ pub fn opts() -> TargetOptions {
// Tell GCC to avoid linker plugins, because we are not bundling
// them with Windows installer, and Rust does its own LTO anyways.
"-fno-use-linker-plugin".to_string(),
// Always enable DEP (NX bit) when it is available
"-Wl,--nxcompat".to_string(),
// Enable ASLR
"-Wl,--dynamicbase".to_string(),
// ASLR will rebase it anyway so leaving that option enabled only leads to confusion

2
compiler/rustc_target/src/spec/x86_64_fortanix_unknown_sgx.rs
View file

@ -4,8 +4,6 @@ use super::{LinkerFlavor, LldFlavor, PanicStrategy, Target, TargetOptions};
pub fn target() -> Target {
const PRE_LINK_ARGS: &[&str] = &[
"-z",
"noexecstack",
"-e",
"elf_entry",
"-Bstatic",