From owner-p4-projects@FreeBSD.ORG  Wed Aug 16 20:48:09 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 2876A16A4DF; Wed, 16 Aug 2006 20:48:09 +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 DB3A916A4DE
	for <perforce@FreeBSD.org>; Wed, 16 Aug 2006 20:48:08 +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 A88FB43D49
	for <perforce@FreeBSD.org>; Wed, 16 Aug 2006 20:48:08 +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 k7GKm8hA029416
	for <perforce@FreeBSD.org>; Wed, 16 Aug 2006 20:48:08 GMT
	(envelope-from cdjones@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GKm8rs029413
	for perforce@freebsd.org; Wed, 16 Aug 2006 20:48:08 GMT
	(envelope-from cdjones@FreeBSD.org)
Date: Wed, 16 Aug 2006 20:48:08 GMT
Message-Id: <200608162048.k7GKm8rs029413@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 104291 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: Wed, 16 Aug 2006 20:48:09 -0000

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

Change 104291 by cdjones@cdjones_meanook on 2006/08/16 20:47:17

	Fix crash in schedcpu.  
	No, Virginia, when you try writing to a NULL value (i.e. when a process isn't jailed), good things do not happen.

Affected files ...

.. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_hier.c#11 edit

Differences ...

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

@@ -541,7 +541,9 @@
 			if (kg->kg_slptime > 1)
 				continue;
 			kg->kg_estcpu = decay_cpu(loadfac, kg->kg_estcpu);
-			kg->kg_proc->p_ucred->cr_prison->pr_estcpu += kg->kg_estcpu;
+			if (kg->kg_proc->p_ucred->cr_prison)
+				kg->kg_proc->p_ucred->cr_prison->pr_estcpu += 
+				  kg->kg_estcpu;
 		      	resetpriority(kg);
 			FOREACH_THREAD_IN_GROUP(kg, td) {
 				resetpriority_thread(td, kg);