From owner-svn-src-head@FreeBSD.ORG  Sat Apr 13 07:23:38 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 5066499A;
 Sat, 13 Apr 2013 07:23:38 +0000 (UTC)
 (envelope-from jchandra@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 42A5036D;
 Sat, 13 Apr 2013 07:23:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3D7NbQG042464;
 Sat, 13 Apr 2013 07:23:37 GMT
 (envelope-from jchandra@svn.freebsd.org)
Received: (from jchandra@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3D7Nbnr042463;
 Sat, 13 Apr 2013 07:23:37 GMT
 (envelope-from jchandra@svn.freebsd.org)
Message-Id: <201304130723.r3D7Nbnr042463@svn.freebsd.org>
From: "Jayachandran C." <jchandra@FreeBSD.org>
Date: Sat, 13 Apr 2013 07:23:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r249436 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Sat, 13 Apr 2013 07:23:38 -0000

Author: jchandra
Date: Sat Apr 13 07:23:37 2013
New Revision: 249436
URL: http://svnweb.freebsd.org/changeset/base/249436

Log:
  Fix changes made in r249408.
  
  In some cases, kern_envp is set by the architecture code and env_pos does
  not contain the length of the static kernel environment. In these cases
  r249408 causes the kernel to discard the environment.
  
  Fix this by updating the check for empty static env to *kern_envp != '\0'
  
  Reported by:	np@

Modified:
  head/sys/kern/kern_environment.c

Modified: head/sys/kern/kern_environment.c
==============================================================================
--- head/sys/kern/kern_environment.c	Sat Apr 13 05:11:21 2013	(r249435)
+++ head/sys/kern/kern_environment.c	Sat Apr 13 07:23:37 2013	(r249436)
@@ -231,7 +231,7 @@ init_dynamic_kenv(void *data __unused)
 	kenvp = malloc((KENV_SIZE + 1) * sizeof(char *), M_KENV,
 		M_WAITOK | M_ZERO);
 	i = 0;
-	if (env_pos > 0) {
+	if (*kern_envp != '\0') {
 		for (cp = kern_envp; cp != NULL; cp = kernenv_next(cp)) {
 			len = strlen(cp) + 1;
 			if (len > KENV_MNAMELEN + 1 + KENV_MVALLEN + 1) {