From owner-svn-src-head@FreeBSD.ORG  Tue Dec 30 17:54:26 2008
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 1938910656CE;
	Tue, 30 Dec 2008 17:54:26 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 03C668FC13;
	Tue, 30 Dec 2008 17:54:26 +0000 (UTC) (envelope-from pho@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 mBUHsPUY000382;
	Tue, 30 Dec 2008 17:54:25 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBUHsPjR000381;
	Tue, 30 Dec 2008 17:54:25 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <200812301754.mBUHsPjR000381@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Tue, 30 Dec 2008 17:54:25 +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: r186606 - 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: Tue, 30 Dec 2008 17:54:26 -0000

Author: pho
Date: Tue Dec 30 17:54:25 2008
New Revision: 186606
URL: http://svn.freebsd.org/changeset/base/186606

Log:
  Make sure that unused j->ip[46] are cleared
  
  Reviewed by:	bz
  Approved by:	kib (mentor)

Modified:
  head/sys/kern/kern_jail.c

Modified: head/sys/kern/kern_jail.c
==============================================================================
--- head/sys/kern/kern_jail.c	Tue Dec 30 17:36:32 2008	(r186605)
+++ head/sys/kern/kern_jail.c	Tue Dec 30 17:54:25 2008	(r186606)
@@ -293,7 +293,8 @@ jail_copyin_ips(struct jail *j)
 		}
 
 		j->ip4 = ip4;
-	}
+	} else
+		j->ip4 = NULL;
 #endif
 #ifdef INET6
 	if (j->ip6s > 0) {
@@ -320,7 +321,8 @@ jail_copyin_ips(struct jail *j)
 		}
 
 		j->ip6 = ip6;
-	}
+	} else
+		j->ip6 = NULL;
 #endif
 	return (0);