d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix mis-merge

Browse Source 
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
This commit is contained in:
Konstantin Belousov 2019-08-05 19:16:33 +00:00
parent 70d20ed34f
commit 01c3ba9752
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=350607
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/kern/kern_exec.c
View File

@ -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 :