From owner-svn-src-head@FreeBSD.ORG  Sun Jan  4 12:18:18 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 E36C1106564A;
	Sun,  4 Jan 2009 12:18:18 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D28C48FC08;
	Sun,  4 Jan 2009 12:18:18 +0000 (UTC) (envelope-from bz@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 n04CIIFq057164;
	Sun, 4 Jan 2009 12:18:18 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n04CIIDe057163;
	Sun, 4 Jan 2009 12:18:18 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <200901041218.n04CIIDe057163@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sun, 4 Jan 2009 12:18:18 +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: r186736 - 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: Sun, 04 Jan 2009 12:18:19 -0000

Author: bz
Date: Sun Jan  4 12:18:18 2009
New Revision: 186736
URL: http://svn.freebsd.org/changeset/base/186736

Log:
  Back out r186615; the sanitizing of the pointers in the error case
  is not needed and seems that it will not be needed either.
  
  Pointy hat:	mine, mine, mine and not pho's

Modified:
  head/sys/kern/kern_jail.c

Modified: head/sys/kern/kern_jail.c
==============================================================================
--- head/sys/kern/kern_jail.c	Sun Jan  4 11:31:03 2009	(r186735)
+++ head/sys/kern/kern_jail.c	Sun Jan  4 12:18:18 2009	(r186736)
@@ -329,11 +329,9 @@ jail_copyin_ips(struct jail *j)
 e_free_ip:
 #ifdef INET6
 	free(ip6, M_PRISON);
-	j->ip6 = NULL;
 #endif
 #ifdef INET
 	free(ip4, M_PRISON);
-	j->ip4 = NULL;
 #endif
 	return (error);
 }