diff options
| -rw-r--r-- | lld/ELF/Config.h | 1 | ||||
| -rw-r--r-- | lld/ELF/Driver.cpp | 1 | ||||
| -rw-r--r-- | lld/ELF/LinkerScript.cpp | 1 | ||||
| -rw-r--r-- | lld/ELF/Writer.cpp | 7 | ||||
| -rw-r--r-- | lld/test/ELF/linkerscript/openbsd-wxneeded.s | 17 | ||||
| -rw-r--r-- | lld/test/ELF/openbsd-wxneeded.s | 17 |
6 files changed, 44 insertions, 0 deletions
diff --git a/lld/ELF/Config.h b/lld/ELF/Config.h index 2ea9f7c9e3d..61bec39daad 100644 --- a/lld/ELF/Config.h +++ b/lld/ELF/Config.h @@ -126,6 +126,7 @@ struct Configuration { bool ZNow; bool ZOrigin; bool ZRelro; + bool ZWxneeded; DiscardPolicy Discard; SortSectionPolicy SortSection; StripPolicy Strip = StripPolicy::None; diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp index fee497b63f7..a46416e802a 100644 --- a/lld/ELF/Driver.cpp +++ b/lld/ELF/Driver.cpp @@ -494,6 +494,7 @@ void LinkerDriver::readConfigs(opt::InputArgList &Args) { Config->ZNow = hasZOption(Args, "now"); Config->ZOrigin = hasZOption(Args, "origin"); Config->ZRelro = !hasZOption(Args, "norelro"); + Config->ZWxneeded = hasZOption(Args, "wxneeded"); if (!Config->Relocatable) Config->Strip = getStripOption(Args); diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp index 1a612b278e8..368b5e9e2b3 100644 --- a/lld/ELF/LinkerScript.cpp +++ b/lld/ELF/LinkerScript.cpp @@ -1720,6 +1720,7 @@ unsigned ScriptParser::readPhdrType() { .Case("PT_GNU_EH_FRAME", PT_GNU_EH_FRAME) .Case("PT_GNU_STACK", PT_GNU_STACK) .Case("PT_GNU_RELRO", PT_GNU_RELRO) + .Case("PT_OPENBSD_WXNEEDED", PT_OPENBSD_WXNEEDED) .Default(-1); if (Ret == (unsigned)-1) { diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp index 5688cc2f6d9..84b19287563 100644 --- a/lld/ELF/Writer.cpp +++ b/lld/ELF/Writer.cpp @@ -1109,6 +1109,13 @@ std::vector<PhdrEntry<ELFT>> Writer<ELFT>::createPhdrs() { Hdr.H.p_memsz = Config->ZStackSize; } + // PT_OPENBSD_WXNEEDED is a OpenBSD-specific header to mark the executable + // is expected to perform W^X violations, such as calling mprotect(2) or + // mmap(2) with PROT_WRITE | PROT_EXEC, which is prohibited by default on + // OpenBSD. + if (Config->ZWxneeded) + AddHdr(PT_OPENBSD_WXNEEDED, PF_X); + if (Note.First) Ret.push_back(std::move(Note)); return Ret; diff --git a/lld/test/ELF/linkerscript/openbsd-wxneeded.s b/lld/test/ELF/linkerscript/openbsd-wxneeded.s new file mode 100644 index 00000000000..accc48f5738 --- /dev/null +++ b/lld/test/ELF/linkerscript/openbsd-wxneeded.s @@ -0,0 +1,17 @@ +# RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %s -o %t.o +# RUN: echo "PHDRS { text PT_LOAD FILEHDR PHDRS; wxneeded PT_OPENBSD_WXNEEDED; }" > %t.script +# RUN: ld.lld -z wxneeded --script %t.script %t.o -o %t +# RUN: llvm-readobj --program-headers %t | FileCheck %s + +# CHECK: ProgramHeader { +# CHECK: Type: (0x65A3DBE7) +# CHECK-NEXT: Offset: 0x0 +# CHECK-NEXT: VirtualAddress: 0x0 +# CHECK-NEXT: PhysicalAddress: 0x0 +# CHECK-NEXT: FileSize: 0 +# CHECK-NEXT: MemSize: 0 +# CHECK-NEXT: Flags [ +# CHECK-NEXT: PF_R +# CHECK-NEXT: ] +# CHECK-NEXT: Alignment: 0 +# CHECK-NEXT: } diff --git a/lld/test/ELF/openbsd-wxneeded.s b/lld/test/ELF/openbsd-wxneeded.s new file mode 100644 index 00000000000..375b4dd8d46 --- /dev/null +++ b/lld/test/ELF/openbsd-wxneeded.s @@ -0,0 +1,17 @@ +# REQUIRES: x86 +# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t +# RUN: ld.lld -z wxneeded %t -o %t.out +# RUN: llvm-readobj --program-headers %t.out | FileCheck %s + +# CHECK: ProgramHeader { +# CHECK: Type: (0x65A3DBE7) +# CHECK-NEXT: Offset: 0x0 +# CHECK-NEXT: VirtualAddress: 0x0 +# CHECK-NEXT: PhysicalAddress: 0x0 +# CHECK-NEXT: FileSize: 0 +# CHECK-NEXT: MemSize: 0 +# CHECK-NEXT: Flags [ +# CHECK-NEXT: PF_X +# CHECK-NEXT: ] +# CHECK-NEXT: Alignment: 0 +# CHECK-NEXT: } |
