From owner-svn-src-all@FreeBSD.ORG  Wed May  6 21:03:20 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CD30BB5B;
 Wed,  6 May 2015 21:03:20 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BC4331D8D;
 Wed,  6 May 2015 21:03:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t46L3K7V035410;
 Wed, 6 May 2015 21:03:20 GMT (envelope-from mjg@FreeBSD.org)
Received: (from mjg@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t46L3KdM035409;
 Wed, 6 May 2015 21:03:20 GMT (envelope-from mjg@FreeBSD.org)
Message-Id: <201505062103.t46L3KdM035409@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: mjg set sender to mjg@FreeBSD.org
 using -f
From: Mateusz Guzik <mjg@FreeBSD.org>
Date: Wed, 6 May 2015 21:03:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r282567 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 May 2015 21:03:20 -0000

Author: mjg
Date: Wed May  6 21:03:19 2015
New Revision: 282567
URL: https://svnweb.freebsd.org/changeset/base/282567

Log:
  Fix up panics when fork fails due to hitting proc limit
  
  The function clearning credentials on failure asserts the process is a
  zombie, which is not true when fork fails.
  
  Changing creds to NULL is unnecessary, but is still being done for
  consistency with other code.
  
  Pointy hat: mjg
  Reported by: pho

Modified:
  head/sys/kern/kern_fork.c

Modified: head/sys/kern/kern_fork.c
==============================================================================
--- head/sys/kern/kern_fork.c	Wed May  6 19:58:12 2015	(r282566)
+++ head/sys/kern/kern_fork.c	Wed May  6 21:03:19 2015	(r282567)
@@ -943,7 +943,8 @@ fail:
 #endif
 	racct_proc_exit(newproc);
 fail1:
-	crfree(proc_set_cred(newproc, NULL));
+	crfree(newproc->p_ucred);
+	newproc->p_ucred = NULL;
 fail2:
 	if (vm2 != NULL)
 		vmspace_free(vm2);