From owner-svn-src-all@FreeBSD.ORG  Mon Jan  5 23:07:23 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 D329F6D7;
 Mon,  5 Jan 2015 23:07:23 +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 BF147640DA;
 Mon,  5 Jan 2015 23:07:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t05N7N0h001100;
 Mon, 5 Jan 2015 23:07:23 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t05N7Nfj001099;
 Mon, 5 Jan 2015 23:07:23 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201501052307.t05N7Nfj001099@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Mon, 5 Jan 2015 23:07:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r276727 - 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.18-1
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: Mon, 05 Jan 2015 23:07:23 -0000

Author: markj
Date: Mon Jan  5 23:07:22 2015
New Revision: 276727
URL: https://svnweb.freebsd.org/changeset/base/276727

Log:
  Use crcopysafe(9) to make a copy of a process' credential struct. crcopy(9)
  may perform a blocking memory allocation, which is unsafe when holding a
  mutex.
  
  Differential Revision:	https://reviews.freebsd.org/D1443
  Reviewed by:	rwatson
  MFC after:	1 week
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/sys/kern/sys_capability.c

Modified: head/sys/kern/sys_capability.c
==============================================================================
--- head/sys/kern/sys_capability.c	Mon Jan  5 21:39:35 2015	(r276726)
+++ head/sys/kern/sys_capability.c	Mon Jan  5 23:07:22 2015	(r276727)
@@ -102,8 +102,7 @@ sys_cap_enter(struct thread *td, struct 
 	newcred = crget();
 	p = td->td_proc;
 	PROC_LOCK(p);
-	oldcred = p->p_ucred;
-	crcopy(newcred, oldcred);
+	oldcred = crcopysafe(p, newcred);
 	newcred->cr_flags |= CRED_FLAG_CAPMODE;
 	p->p_ucred = newcred;
 	PROC_UNLOCK(p);