From owner-svn-src-all@FreeBSD.ORG  Wed Dec 11 17:18:10 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id DE3BBD8D;
 Wed, 11 Dec 2013 17:18:10 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id CA5D211FC;
 Wed, 11 Dec 2013 17:18:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBBHIAYH065187;
 Wed, 11 Dec 2013 17:18:10 GMT (envelope-from gnn@svn.freebsd.org)
Received: (from gnn@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBBHIAgM065186;
 Wed, 11 Dec 2013 17:18:10 GMT (envelope-from gnn@svn.freebsd.org)
Message-Id: <201312111718.rBBHIAgM065186@svn.freebsd.org>
From: "George V. Neville-Neil" <gnn@FreeBSD.org>
Date: Wed, 11 Dec 2013 17:18:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r259221 - head/sys/dev/vt
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.17
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: Wed, 11 Dec 2013 17:18:10 -0000

Author: gnn
Date: Wed Dec 11 17:18:10 2013
New Revision: 259221
URL: http://svnweb.freebsd.org/changeset/base/259221

Log:
  Fix a panic when booting with kernels that have FREEBBSD_COMPAT
  4, 5, 6 or 43 by only thunking the data parameter for old ioctls
  compatability ioctls instead of doing it for all of them.
  
  Submitted by:	jhb@

Modified:
  head/sys/dev/vt/vt_core.c

Modified: head/sys/dev/vt/vt_core.c
==============================================================================
--- head/sys/dev/vt/vt_core.c	Wed Dec 11 15:32:28 2013	(r259220)
+++ head/sys/dev/vt/vt_core.c	Wed Dec 11 17:18:10 2013	(r259221)
@@ -1321,9 +1321,12 @@ vtterm_ioctl(struct terminal *tm, u_long
 	case _IO('c', 110):
 		cmd = CONS_SETKBD;
 		break;
+	default:
+		goto skip_thunk;
 	}
 	ival = IOCPARM_IVAL(data);
 	data = (caddr_t)&ival;
+skip_thunk:
 #endif
 
 	switch (cmd) {