From owner-svn-src-all@FreeBSD.ORG  Wed May 21 11:15:38 2014
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])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CE082F81;
 Wed, 21 May 2014 11:15:38 +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 BB1A92C9D;
 Wed, 21 May 2014 11:15:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4LBFcID057533;
 Wed, 21 May 2014 11:15:38 GMT (envelope-from ray@svn.freebsd.org)
Received: (from ray@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4LBFcPw057532;
 Wed, 21 May 2014 11:15:38 GMT (envelope-from ray@svn.freebsd.org)
Message-Id: <201405211115.s4LBFcPw057532@svn.freebsd.org>
From: Aleksandr Rybalko <ray@FreeBSD.org>
Date: Wed, 21 May 2014 11:15:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r266495 - 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.18
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, 21 May 2014 11:15:38 -0000

Author: ray
Date: Wed May 21 11:15:38 2014
New Revision: 266495
URL: http://svnweb.freebsd.org/changeset/base/266495

Log:
  Fix tty locking.
  o Correct expected values for VT_LOCKSWITCH ioctl.
  o Check current window for locked state.
  
  Sponsored by:	The FreeBSD Foundation

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

Modified: head/sys/dev/vt/vt_core.c
==============================================================================
--- head/sys/dev/vt/vt_core.c	Wed May 21 10:04:51 2014	(r266494)
+++ head/sys/dev/vt/vt_core.c	Wed May 21 11:15:38 2014	(r266495)
@@ -280,12 +280,12 @@ vt_proc_window_switch(struct vt_window *
 	struct vt_device *vd;
 	int ret;
 
-	if (vw->vw_flags & VWF_VTYLOCK)
-		return (EBUSY);
-
 	vd = vw->vw_device;
 	curvw = vd->vd_curwindow;
 
+	if (curvw->vw_flags & VWF_VTYLOCK)
+		return (EBUSY);
+
 	/* Ask current process permitions to switch away. */
 	if (curvw->vw_smode.mode == VT_PROCESS) {
 		DPRINTF(30, "%s: VT_PROCESS ", __func__);
@@ -1814,10 +1814,12 @@ skip_thunk:
 		return (0);
 	case VT_LOCKSWITCH:
 		/* TODO: Check current state, switching can be in progress. */
-		if ((*(int *)data) & 0x01)
+		if ((*(int *)data) == 0x01)
+			vw->vw_flags &= ~VWF_VTYLOCK;
+		else if ((*(int *)data) == 0x02)
 			vw->vw_flags |= VWF_VTYLOCK;
 		else
-			vw->vw_flags &= ~VWF_VTYLOCK;
+			return (EINVAL);
 		return (0);
 	case VT_OPENQRY:
 		VT_LOCK(vd);