From owner-svn-src-head@FreeBSD.ORG  Wed Apr  8 19:12:39 2015
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])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 76EB1D88;
 Wed,  8 Apr 2015 19:12:39 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 61E0EACA;
 Wed,  8 Apr 2015 19:12:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t38JCdo9085462;
 Wed, 8 Apr 2015 19:12:39 GMT (envelope-from dteske@FreeBSD.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t38JCdN3085460;
 Wed, 8 Apr 2015 19:12:39 GMT (envelope-from dteske@FreeBSD.org)
Message-Id: <201504081912.t38JCdN3085460@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: dteske set sender to
 dteske@FreeBSD.org using -f
From: Devin Teske <dteske@FreeBSD.org>
Date: Wed, 8 Apr 2015 19:12:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r281271 - head/sys/boot/forth
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.18-1
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: Wed, 08 Apr 2015 19:12:39 -0000

Author: dteske
Date: Wed Apr  8 19:12:38 2015
New Revision: 281271
URL: https://svnweb.freebsd.org/changeset/base/281271

Log:
  Fix a bootlock condition if/when loader_logo is set in loader.conf(5)
  NB: This deeply effected HardenedBSD which had a default value set.
  
  Embarassingly, I allowed the `type' primitive to be passed -1/-1 for
  c-addr/u stack input (the effect of which is to pull INT_MAX bytes
  from character address negative one in which hilarity ensues over a
  black screen in full-on bootlock). Much thanks to Shawn Webb [lattera]
  for helping me diagnose.
  
  NB: The mode-ending revisions were initially suspected (and reverted)
  but proved to be a red-herring. Proper mode endings will be returning.
  
  Thanks to:	lattera (@HardenedBSD [<dot><com>])
  Reported by:	lattera
  MFC after:	3 days
  X-MFC-to:	stable/10

Modified:
  head/sys/boot/forth/version.4th

Modified: head/sys/boot/forth/version.4th
==============================================================================
--- head/sys/boot/forth/version.4th	Wed Apr  8 19:07:06 2015	(r281270)
+++ head/sys/boot/forth/version.4th	Wed Apr  8 19:12:38 2015	(r281271)
@@ -85,10 +85,12 @@ only forth definitions also version-proc
 	dup versionX @ swap - versionY @ at-xy
 
 	\ Print the version (optionally in cyan)
-	loader_color? dup ( -- bool bool )
+	loader_color? dup ( c-addr/u -- c-addr/u bool bool )
 	if 6 fg then
-	type
+	-rot type
 	if 7 fg then
+
+	0 25 at-xy
 ;
 
 only forth definitions