summaryrefslogtreecommitdiffstats
path: root/lib/csu/arm/md_init.h
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2020-10-15 16:30:21 +0000
committerderaadt <deraadt@openbsd.org>2020-10-15 16:30:21 +0000
commit2bc3a8c076b486ad5cb1adf52ac1373fba054b0a (patch)
tree06ae83440149f8e2a0f25702b3e01f4bf7e55e65 /lib/csu/arm/md_init.h
parentsys/kernel.h: remove dead externs: tickfix, tixfixinterval, tickdelta, ... (diff)
downloadwireguard-openbsd-2bc3a8c076b486ad5cb1adf52ac1373fba054b0a.tar.xz
wireguard-openbsd-2bc3a8c076b486ad5cb1adf52ac1373fba054b0a.zip
crt0 MD _dl_exit() performs syscall to SYS_exit directly, but then
some of these functions were returning. That makes the +1word address a fairly strong and easily located gadget. Put a hard-trap instruction after the syscall. This remains a gadget for 'terminal system' calls (such as execve), but hey that's why we have pledge w/o "exec" throughout the tree. Quite surprisingly, hppa's delay-slot load of SYS_exit makes it the safest of the bunch, not that this helps anyone. ok kettenis
Diffstat (limited to 'lib/csu/arm/md_init.h')
-rw-r--r--lib/csu/arm/md_init.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/csu/arm/md_init.h b/lib/csu/arm/md_init.h
index c8026dfde56..d80c0cccbb5 100644
--- a/lib/csu/arm/md_init.h
+++ b/lib/csu/arm/md_init.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: md_init.h,v 1.15 2020/10/14 22:11:19 deraadt Exp $ */
+/* $OpenBSD: md_init.h,v 1.16 2020/10/15 16:30:23 deraadt Exp $ */
/*-
* Copyright (c) 2001 Ross Harvey
@@ -159,4 +159,5 @@
" swi #0 \n" \
" dsb nsh \n" \
" isb \n" \
+ " .word 0xa000f7f0 /* illegal */ \n" \
".previous");