diff options
| author | trasz <trasz@FreeBSD.org> | 2011-10-04 14:56:33 +0000 |
|---|---|---|
| committer | trasz <trasz@FreeBSD.org> | 2011-10-04 14:56:33 +0000 |
| commit | 09473dab33baab19725611acc96549d427df6540 (patch) | |
| tree | ed58a0e92f73859a9c681b85d77257b31417b2db /sys/kern | |
| parent | b7672d6f5ec484e1580a003f39104c7b3d38b74c (diff) | |
| download | FreeBSD-src-09473dab33baab19725611acc96549d427df6540.zip FreeBSD-src-09473dab33baab19725611acc96549d427df6540.tar.gz | |
Actually enforce limit for inheritable resources on fork.
MFC after: 3 days
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_racct.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/kern/kern_racct.c b/sys/kern/kern_racct.c index 04beabd..a32814f 100644 --- a/sys/kern/kern_racct.c +++ b/sys/kern/kern_racct.c @@ -567,6 +567,12 @@ racct_proc_fork(struct proc *parent, struct proc *child) PROC_LOCK(child); mtx_lock(&racct_lock); +#ifdef RCTL + error = rctl_proc_fork(parent, child); + if (error != 0) + goto out; +#endif + /* * Inherit resource usage. */ @@ -581,12 +587,6 @@ racct_proc_fork(struct proc *parent, struct proc *child) 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_NTHR, 1); |
