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

Actually enforce limit for inheritable resources on fork.

Browse Source 
MFC after:	3 days
This commit is contained in:
Edward Tomasz Napierala 2011-10-04 14:56:33 +00:00
parent c6ae748382
commit c0c0936205
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/kern/kern_racct.c
View File

@ -567,6 +567,12 @@ racct_proc_fork(struct proc *parent, struct proc *child)
PROC_LOCK(child); PROC_LOCK(child);
mtx_lock(&racct_lock); mtx_lock(&racct_lock);
#ifdef RCTL
error = rctl_proc_fork(parent, child);
if (error != 0)
goto out;
#endif
/* /*
* Inherit resource usage. * Inherit resource usage.
*/ */
@ -581,12 +587,6 @@ racct_proc_fork(struct proc *parent, struct proc *child)
goto out; goto out;
} }
#ifdef RCTL
error = rctl_proc_fork(parent, child);
if (error != 0)
goto out;
#endif
error = racct_add_locked(child, RACCT_NPROC, 1); error = racct_add_locked(child, RACCT_NPROC, 1);
error += racct_add_locked(child, RACCT_NTHR, 1); error += racct_add_locked(child, RACCT_NTHR, 1);