diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2016-05-10 18:39:54 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2016-05-10 18:39:54 +0000 |
| commit | 869ce5a1007a9d00bbac5121d825c80be70f9dde (patch) | |
| tree | 26cd16954837176d7032fd1841853c34c5b32f99 /sys/kern/init_main.c | |
| parent | 24ed245ec22671d3d288d52c91f39a81a24637bf (diff) | |
SROP mitigation. sendsig() stores a (per-process ^ &sigcontext) cookie
inside the sigcontext. sigreturn(2) checks syscall entry was from the
exact PC addr in the (per-process ASLR) sigtramp, verifies the cookie,
and clears it to prevent sigcontext reuse.
not yet tested on landisk, sparc, *88k, socppc.
ok kettenis
Diffstat (limited to 'sys/kern/init_main.c')
| -rw-r--r-- | sys/kern/init_main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index 61110b51abb..44f73a20e8b 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: init_main.c,v 1.250 2016/05/03 14:52:39 mpi Exp $ */ +/* $OpenBSD: init_main.c,v 1.251 2016/05/10 18:39:51 deraadt Exp $ */ /* $NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $ */ /* @@ -144,7 +144,7 @@ void kqueue_init(void); void taskq_init(void); void pool_gc_pages(void *); -extern char sigcode[], esigcode[]; +extern char sigcode[], esigcode[], sigcoderet[]; #ifdef SYSCALL_DEBUG extern char *syscallnames[]; #endif @@ -168,6 +168,7 @@ struct emul emul_native = { NULL, /* coredump */ sigcode, esigcode, + sigcoderet, EMUL_ENABLED | EMUL_NATIVE, }; |