From owner-svn-src-all@FreeBSD.ORG  Tue Apr 16 22:09:08 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id F0A52C5B;
 Tue, 16 Apr 2013 22:09:08 +0000 (UTC) (envelope-from imp@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 E3A2A1B38;
 Tue, 16 Apr 2013 22:09:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3GM98BQ026880;
 Tue, 16 Apr 2013 22:09:08 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3GM98RO026879;
 Tue, 16 Apr 2013 22:09:08 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201304162209.r3GM98RO026879@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 16 Apr 2013 22:09:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r249570 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Apr 2013 22:09:09 -0000

Author: imp
Date: Tue Apr 16 22:09:08 2013
New Revision: 249570
URL: http://svnweb.freebsd.org/changeset/base/249570

Log:
  r249408 and r249436 cause a NULL pointer dereference on the CUBIEBOARD
  since it doesn't set the kernel envrionment at all. Work around this
  by making sure kern_envp is non-NULL before dereferencing it.

Modified:
  head/sys/kern/kern_environment.c

Modified: head/sys/kern/kern_environment.c
==============================================================================
--- head/sys/kern/kern_environment.c	Tue Apr 16 21:26:44 2013	(r249569)
+++ head/sys/kern/kern_environment.c	Tue Apr 16 22:09:08 2013	(r249570)
@@ -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 (*kern_envp != '\0') {
+	if (kern_envp && *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) {