aboutsummaryrefslogtreecommitdiff
path: root/update.sh
diff options
context:
space:
mode:
authorBrent Cook <busterb@gmail.com>2014-12-21 23:14:02 -0600
committerBrent Cook <bcook@openbsd.org>2014-12-22 23:04:47 -0600
commit04158cd40e184e2325a7a0e5fef232cce038cc4b (patch)
tree06f5f4b7ae29efbfe76a976754bd9124ad9e1d18 /update.sh
parent8c6c07c5ba7e4f862a4f70b2f1bf7c1fc7f968f2 (diff)
downloadportable-04158cd40e184e2325a7a0e5fef232cce038cc4b.tar.gz
portable-04158cd40e184e2325a7a0e5fef232cce038cc4b.tar.bz2
portable-04158cd40e184e2325a7a0e5fef232cce038cc4b.zip
do not mark GNU_STACK WX in ELFs generated from assembly
When generating ELF objects from assembly, gcc and clang mark the GNU_STACK program headers as RWX by default. This is a security issue, so we make sure it is marked only RW. This modifies Anthony G. Basile's original patch for Linux to set .note.GNU-stack whenever the assembler supports it. It is surprising that any modern toolchain would enable an executable stack without an explicit request. The number of programs that need an executable stack is surely much smaller than the number of programs that include assembly.
Diffstat (limited to 'update.sh')
-rwxr-xr-xupdate.sh10
1 files changed, 10 insertions, 0 deletions
diff --git a/update.sh b/update.sh
index c49f7eb..c8ec876 100755
--- a/update.sh
+++ b/update.sh
@@ -125,10 +125,20 @@ $CP crypto/compat/ui_openssl_win.c crypto/ui
125asm_src=$libssl_src/src/crypto 125asm_src=$libssl_src/src/crypto
126gen_asm_stdout() { 126gen_asm_stdout() {
127 perl $asm_src/$2 $1 > $3.tmp 127 perl $asm_src/$2 $1 > $3.tmp
128 [[ $1 == "elf" ]] && cat <<-EOF >> $3.tmp
129 #if defined(HAVE_GNU_STACK)
130 .section .note.GNU-stack,"",%progbits
131 #endif
132 EOF
128 $MV $3.tmp $3 133 $MV $3.tmp $3
129} 134}
130gen_asm() { 135gen_asm() {
131 perl $asm_src/$2 $1 $3.tmp 136 perl $asm_src/$2 $1 $3.tmp
137 [[ $1 == "elf" ]] && cat <<-EOF >> $3.tmp
138 #if defined(HAVE_GNU_STACK)
139 .section .note.GNU-stack,"",%progbits
140 #endif
141 EOF
132 $MV $3.tmp $3 142 $MV $3.tmp $3
133} 143}
134for abi in elf macosx; do 144for abi in elf macosx; do