diff options
| author | dim <dim@FreeBSD.org> | 2015-07-04 21:50:39 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-07-04 21:50:39 +0000 |
| commit | 6f44bd3256388beb23fd03fdf43ad5d53cf43e29 (patch) | |
| tree | 37590f5c697f4198fdddec33c58aefdef0a5f485 /sys/vm/vm_map.c | |
| parent | cea4c167517a0678c7dbf92a0324088dcbac1035 (diff) | |
| parent | 76b8ff88e56f9ad0639b7e23dd9d1128a0750026 (diff) | |
| download | FreeBSD-src-6f44bd3256388beb23fd03fdf43ad5d53cf43e29.zip FreeBSD-src-6f44bd3256388beb23fd03fdf43ad5d53cf43e29.tar.gz | |
Merge ^/head r284737 through r285152.
Diffstat (limited to 'sys/vm/vm_map.c')
| -rw-r--r-- | sys/vm/vm_map.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 12ebf5d..f8172bd 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -3640,7 +3640,8 @@ Retry: return (KERN_NO_SPACE); } - is_procstack = (addr >= (vm_offset_t)vm->vm_maxsaddr) ? 1 : 0; + is_procstack = (addr >= (vm_offset_t)vm->vm_maxsaddr && + addr < (vm_offset_t)p->p_sysent->sv_usrstack) ? 1 : 0; /* * If this is the main process stack, see if we're over the stack |
