yasm: No executable stack

Closes #5588
openwall · Nov 28, 2024 · 2fce717 · 2fce717
1 parent 7df682c
commit 2fce717
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 0 deletions.
diff --git a/src/aes/aesni/asm/x64/do_rdtsc.s b/src/aes/aesni/asm/x64/do_rdtsc.s
@@ -1,6 +1,13 @@
 [bits 64]
 [CPU intelnop]
 
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+%ifidn __OUTPUT_FORMAT__,elf64
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+
 ; Copyright (c) 2010, Intel Corporation
 ; All rights reserved.
 ;

diff --git a/src/aes/aesni/asm/x64/iaesx64.s b/src/aes/aesni/asm/x64/iaesx64.s
@@ -1,6 +1,13 @@
 [bits 64]
 [CPU intelnop]
 
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+%ifidn __OUTPUT_FORMAT__,elf64
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+
 ; Copyright (c) 2010, Intel Corporation
 ; All rights reserved.
 ;

diff --git a/src/aes/aesni/asm/x86/do_rdtsc.s b/src/aes/aesni/asm/x86/do_rdtsc.s
@@ -1,6 +1,13 @@
 [bits 32]
 [CPU intelnop]
 
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+%ifidn __OUTPUT_FORMAT__,elf32
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+
 ; Copyright (c) 2010, Intel Corporation
 ; All rights reserved.
 ;

diff --git a/src/aes/aesni/asm/x86/iaesx86.s b/src/aes/aesni/asm/x86/iaesx86.s
@@ -1,6 +1,13 @@
 [bits 32]
 [CPU intelnop]
 
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+%ifidn __OUTPUT_FORMAT__,elf32
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+
 ; Copyright (c) 2010, Intel Corporation
 ; All rights reserved.
 ;