From owner-cvs-src@FreeBSD.ORG  Sat Feb 14 10:52:46 2004
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 7BD7116A4CE; Sat, 14 Feb 2004 10:52:46 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 3A68A43D1F; Sat, 14 Feb 2004 10:52:46 -0800 (PST)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1EIqiGe084274;
	Sat, 14 Feb 2004 10:52:44 -0800 (PST)
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1EIqi7T084273;
	Sat, 14 Feb 2004 10:52:44 -0800 (PST)
	(envelope-from rwatson)
Message-Id: <200402141852.i1EIqi7T084273@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 14 Feb 2004 10:52:43 -0800 (PST)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/kern kern_jail.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Feb 2004 18:52:46 -0000

rwatson     2004/02/14 10:52:43 PST

  FreeBSD src repository

  Modified files:
    sys/kern             kern_jail.c 
  Log:
  Fix mismerge in last commit: check that cred->cr_prison is NULL
  before dereferencing the prison pointer.
  
  Revision  Changes    Path
  1.37      +1 -1      src/sys/kern/kern_jail.c