Author: trasz
Date: Sat Sep 17 20:48:49 2011
New Revision: 225642
URL: http://svn.freebsd.org/changeset/base/225642
Log:
Fix error handling bug that would prevent MAC structures from getting
freed properly if resource limit got exceeded.
Approved by: re (kib)
Modified:
head/sys/kern/kern_fork.c
Modified: head/sys/kern/kern_fork.c
==============================================================================
--- head/sys/kern/kern_fork.c Sat Sep 17 19:55:32 2011 (r225641)
+++ head/sys/kern/kern_fork.c Sat Sep 17 20:48:49 2011 (r225642)
@@ -863,11 +863,6 @@ fork1(struct thread *td, int flags, int
}
} else
vm2 = NULL;
-#ifdef MAC
- mac_proc_init(newproc);
-#endif
- knlist_init_mtx(&newproc->p_klist, &newproc->p_mtx);
- STAILQ_INIT(&newproc->p_ktr);
/*
* XXX: This is ugly; when we copy resource usage, we need to bump
@@ -884,6 +879,23 @@ fork1(struct thread *td, int flags, int
goto fail1;
}
+#ifdef RACCT
+ PROC_LOCK(newproc);
+ error = racct_add(newproc, RACCT_NPROC, 1);
+ error += racct_add(newproc, RACCT_NTHR, 1);
+ PROC_UNLOCK(newproc);
+ if (error != 0) {
+ error = EAGAIN;
+ goto fail1;
+ }
+#endif
+
+#ifdef MAC
+ mac_proc_init(newproc);
+#endif
+ knlist_init_mtx(&newproc->p_klist, &newproc->p_mtx);
+ STAILQ_INIT(&newproc->p_ktr);
+
/* We have to lock the process tree while we look for a pid. */
sx_slock(&proctree_lock);
@@ -901,20 +913,6 @@ fork1(struct thread *td, int flags, int
goto fail;
}
-#ifdef RACCT
- /*
- * After fork, there is exactly one thread running.
- */
- PROC_LOCK(newproc);
- error = racct_add(newproc, RACCT_NPROC, 1);
- error += racct_add(newproc, RACCT_NTHR, 1);
- PROC_UNLOCK(newproc);
- if (error != 0) {
- error = EAGAIN;
- goto fail;
- }
-#endif
-
/*
* Increment the count of procs running with this uid. Don't allow
* a nonprivileged user to exceed their current limit.
@@ -946,7 +944,6 @@ fork1(struct thread *td, int flags, int
error = EAGAIN;
fail:
- racct_proc_exit(newproc);
sx_sunlock(&proctree_lock);
if (ppsratecheck(&lastfail, &curfail, 1))
printf("maxproc limit exceeded by uid %i, please see tuning(7)
and login.conf(5).\n",
@@ -956,6 +953,7 @@ fail:
mac_proc_destroy(newproc);
#endif
fail1:
+ racct_proc_exit(newproc);
if (vm2 != NULL)
vmspace_free(vm2);
uma_zfree(proc_zone, newproc);
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
