From owner-svn-src-head@FreeBSD.ORG  Thu Jul  2 14:19:34 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 07E461065673;
	Thu,  2 Jul 2009 14:19:34 +0000 (UTC)
	(envelope-from jamie@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E9EA48FC1B;
	Thu,  2 Jul 2009 14:19:33 +0000 (UTC)
	(envelope-from jamie@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n62EJX9M046651;
	Thu, 2 Jul 2009 14:19:33 GMT (envelope-from jamie@svn.freebsd.org)
Received: (from jamie@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n62EJXMe046649;
	Thu, 2 Jul 2009 14:19:33 GMT (envelope-from jamie@svn.freebsd.org)
Message-Id: <200907021419.n62EJXMe046649@svn.freebsd.org>
From: Jamie Gritton <jamie@FreeBSD.org>
Date: Thu, 2 Jul 2009 14:19:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195285 - head/sys/kern
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Jul 2009 14:19:34 -0000

Author: jamie
Date: Thu Jul  2 14:19:33 2009
New Revision: 195285
URL: http://svn.freebsd.org/changeset/base/195285

Log:
  Call prison_check from vfs_suser rather than re-implementing it.
  
  Approved by:	re (kib), bz (mentor)

Modified:
  head/sys/kern/vfs_subr.c

Modified: head/sys/kern/vfs_subr.c
==============================================================================
--- head/sys/kern/vfs_subr.c	Thu Jul  2 12:41:21 2009	(r195284)
+++ head/sys/kern/vfs_subr.c	Thu Jul  2 14:19:33 2009	(r195285)
@@ -461,8 +461,7 @@ vfs_suser(struct mount *mp, struct threa
 	 * If the file system was mounted outside the jail of the calling
 	 * thread, deny immediately.
 	 */
-	if (mp->mnt_cred->cr_prison != td->td_ucred->cr_prison &&
-	    !prison_ischild(td->td_ucred->cr_prison, mp->mnt_cred->cr_prison))
+	if (prison_check(td->td_ucred, mp->mnt_cred) != 0)
 		return (EPERM);
 
 	/*