diff options
| author |   kettenis <kettenis@openbsd.org> | 2014-10-18 15:20:32 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2014-10-18 15:20:32 +0000 |
| commit | ff3fdef134f8a5d3511f5852e66cc54daa21571f (patch) | |
| tree | 92a9fdfb067a1fdc0cb537d3ca39438b3c8a1c44 | |
| parent | Mention -fstack-shuffle is a gcc4-only thing, but gets silently ignored by (diff) | |
| download | wireguard-openbsd-ff3fdef134f8a5d3511f5852e66cc54daa21571f.tar.xz wireguard-openbsd-ff3fdef134f8a5d3511f5852e66cc54daa21571f.zip | |
Don't assume that ep_taddr and ep_daddr are page-aligned. It is possible to
construct ELF executables for which ep_daddr ends up not being properly
aligned. Sanitize the addresses before setting up the address space for the
new executable. Should fix the panic discovered by Alejandro Hernandez.
ok miod@
| -rw-r--r-- | sys/kern/kern_exec.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index ec83a6b04b3..24ca23c37c6 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_exec.c,v 1.146 2014/09/28 18:52:04 kettenis Exp $ */ +/* $OpenBSD: kern_exec.c,v 1.147 2014/10/18 15:20:32 kettenis Exp $ */ /* $NetBSD: kern_exec.c,v 1.75 1996/02/09 18:59:28 christos Exp $ */ /*- @@ -429,10 +429,12 @@ sys_execve(struct proc *p, void *v, register_t *retval) vm = pr->ps_vmspace; /* Now map address space */ - vm->vm_taddr = (char *)pack.ep_taddr; - vm->vm_tsize = atop(round_page(pack.ep_tsize)); - vm->vm_daddr = (char *)pack.ep_daddr; - vm->vm_dsize = atop(round_page(pack.ep_dsize)); + vm->vm_taddr = (char *)trunc_page(pack.ep_taddr); + vm->vm_tsize = atop(round_page(pack.ep_taddr + pack.ep_tsize) - + trunc_page(pack.ep_taddr)); + vm->vm_daddr = (char *)trunc_page(pack.ep_daddr); + vm->vm_dsize = atop(round_page(pack.ep_daddr + pack.ep_dsize) - + trunc_page(pack.ep_daddr)); vm->vm_dused = 0; vm->vm_ssize = atop(round_page(pack.ep_ssize)); vm->vm_maxsaddr = (char *)pack.ep_maxsaddr; |