Author: trasz
Date: Tue May 22 15:58:27 2012
New Revision: 235787
URL: http://svn.freebsd.org/changeset/base/235787
Log:
Fix panic with RACCT that could occur in low memory (or out of swap)
situations, due to fork1() calling racct_proc_exit() without calling
racct_proc_fork() first.
Submitted by: Mateusz Guzik <mjguzik at gmail dot com> (earlier version)
Reviewed by: Mateusz Guzik <mjguzik at gmail dot com>
Modified:
head/sys/kern/kern_fork.c
head/sys/kern/kern_racct.c
Modified: head/sys/kern/kern_fork.c
==============================================================================
--- head/sys/kern/kern_fork.c Tue May 22 15:26:55 2012 (r235786)
+++ head/sys/kern/kern_fork.c Tue May 22 15:58:27 2012 (r235787)
@@ -939,8 +939,8 @@ fail:
#ifdef MAC
mac_proc_destroy(newproc);
#endif
-fail1:
racct_proc_exit(newproc);
+fail1:
if (vm2 != NULL)
vmspace_free(vm2);
uma_zfree(proc_zone, newproc);
Modified: head/sys/kern/kern_racct.c
==============================================================================
--- head/sys/kern/kern_racct.c Tue May 22 15:26:55 2012 (r235786)
+++ head/sys/kern/kern_racct.c Tue May 22 15:58:27 2012 (r235787)
@@ -573,6 +573,9 @@ out:
PROC_UNLOCK(child);
PROC_UNLOCK(parent);
+ if (error != 0)
+ racct_proc_exit(child);
+
return (error);
}
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
