diff options
| author | marcel <marcel@FreeBSD.org> | 2011-10-13 16:20:10 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 2011-10-13 16:20:10 +0000 |
| commit | d5c0a67c82352d26482cb3fc2ffe3a5e695d854c (patch) | |
| tree | e80d41438146a9af33daafe84708ccae7740c784 /sys/vm | |
| parent | 92e552423dd1f9f8017a9fc26d74339a0b2a626f (diff) | |
| download | FreeBSD-src-d5c0a67c82352d26482cb3fc2ffe3a5e695d854c.zip FreeBSD-src-d5c0a67c82352d26482cb3fc2ffe3a5e695d854c.tar.gz | |
In sys_obreak() and when compiling for amd64 or ia64, when the process
is ILP32 (i.e. i386) grant execute permissions by default. The JDK 1.4.x
depends on being able to execute from the heap on i386.
Diffstat (limited to 'sys/vm')
| -rw-r--r-- | sys/vm/vm_unix.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sys/vm/vm_unix.c b/sys/vm/vm_unix.c index e08aa6a..d4ea3b7 100644 --- a/sys/vm/vm_unix.c +++ b/sys/vm/vm_unix.c @@ -36,6 +36,8 @@ * @(#)vm_unix.c 8.1 (Berkeley) 6/11/93 */ +#include "opt_compat.h" + /* * Traditional sbrk/grow interface to VM */ @@ -49,6 +51,7 @@ __FBSDID("$FreeBSD$"); #include <sys/proc.h> #include <sys/racct.h> #include <sys/resourcevar.h> +#include <sys/sysent.h> #include <sys/sysproto.h> #include <sys/systm.h> @@ -75,7 +78,7 @@ sys_obreak(td, uap) struct vmspace *vm = td->td_proc->p_vmspace; vm_offset_t new, old, base; rlim_t datalim, vmemlim; - int rv; + int prot, rv; int error = 0; boolean_t do_map_wirefuture; @@ -135,8 +138,15 @@ sys_obreak(td, uap) } PROC_UNLOCK(td->td_proc); #endif + prot = VM_PROT_RW; +#ifdef COMPAT_FREEBSD32 +#if defined(__amd64__) || defined(__ia64__) + if (SV_PROC_FLAG(td->td_proc, SV_ILP32)) + prot |= VM_PROT_EXECUTE; +#endif +#endif rv = vm_map_insert(&vm->vm_map, NULL, 0, old, new, - VM_PROT_RW, VM_PROT_ALL, 0); + prot, VM_PROT_ALL, 0); if (rv != KERN_SUCCESS) { #ifdef RACCT PROC_LOCK(td->td_proc); |
