diff options
| author | Konstantin Belousov <kib@FreeBSD.org> | 2019-08-05 19:16:33 +0000 |
|---|---|---|
| committer | Konstantin Belousov <kib@FreeBSD.org> | 2019-08-05 19:16:33 +0000 |
| commit | 01c3ba9752a56f756ba60f294b80fbdbdbf6f891 (patch) | |
| tree | 80cb73f224b6104473d7006a7562c3e4c996feb8 /sys/kern/kern_exec.c | |
| parent | 70d20ed34fb46c822c811db5a0002e818974f01f (diff) | |
| download | src-01c3ba9752a56f756ba60f294b80fbdbdbf6f891.tar.gz src-01c3ba9752a56f756ba60f294b80fbdbdbf6f891.zip | |
Fix mis-merge
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=350607
Diffstat (limited to 'sys/kern/kern_exec.c')
| -rw-r--r-- | sys/kern/kern_exec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index e129f9238f18..e148e0b1f20d 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -1128,7 +1128,9 @@ exec_new_vmspace(struct image_params *imgp, struct sysentvec *sv) } else { ssiz = maxssiz; } - imgp->eff_stack_sz = ssiz; + imgp->eff_stack_sz = lim_cur(curthread, RLIMIT_STACK); + if (ssiz < imgp->eff_stack_sz) + imgp->eff_stack_sz = ssiz; stack_addr = sv->sv_usrstack - ssiz; error = vm_map_stack(map, stack_addr, (vm_size_t)ssiz, obj != NULL && imgp->stack_prot != 0 ? imgp->stack_prot : |