From owner-p4-projects@FreeBSD.ORG  Mon Jul 31 09:21:15 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A2F0C16A4DF; Mon, 31 Jul 2006 09:21:15 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 81CD316A4DD
	for <perforce@FreeBSD.org>; Mon, 31 Jul 2006 09:21:15 +0000 (UTC)
	(envelope-from cdjones@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3D99743D46
	for <perforce@FreeBSD.org>; Mon, 31 Jul 2006 09:21:15 +0000 (GMT)
	(envelope-from cdjones@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6V9LFVv000875
	for <perforce@FreeBSD.org>; Mon, 31 Jul 2006 09:21:15 GMT
	(envelope-from cdjones@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6V9LEM5000872
	for perforce@freebsd.org; Mon, 31 Jul 2006 09:21:14 GMT
	(envelope-from cdjones@FreeBSD.org)
Date: Mon, 31 Jul 2006 09:21:14 GMT
Message-Id: <200607310921.k6V9LEM5000872@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cdjones@FreeBSD.org using -f
From: Chris Jones <cdjones@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 102837 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 31 Jul 2006 09:21:15 -0000

http://perforce.freebsd.org/chv.cgi?CH=102837

Change 102837 by cdjones@cdjones-impulse on 2006/07/31 09:20:22

	Back out changes.

Affected files ...

.. //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_elf.c#6 edit

Differences ...

==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_elf.c#6 (text+ko) ====

@@ -762,10 +762,11 @@
 	PROC_LOCK(imgp->proc);
 	if (data_size > lim_cur(imgp->proc, RLIMIT_DATA) ||
 	    text_size > maxtsiz ||
-	    total_size > lim_cur(imgp->proc, RLIMIT_VMEM) ||
+	    total_size > lim_cur(imgp->proc, RLIMIT_VMEM)) {
+/* ||
 	    (jailed(imgp->proc->p_ucred) && 
 	     total_size > (prison_memory_limit(imgp->proc->p_ucred) 
-			   - prison_memory(imgp->proc->p_ucred)))) {
+			   - prison_memory(imgp->proc->p_ucred)))) { */
 		PROC_UNLOCK(imgp->proc);
 		return (ENOMEM);
 	}