svn commit: r303633 - stable/10/sys/dev/vt

[Ed Maste]

Author: emaste
Date: Mon Aug  1 19:53:18 2016
New Revision: 303633
URL: https://svnweb.freebsd.org/changeset/base/303633

Log:
  MFC r303338: vt: lock Giant around kbd calls in CONS_GETINFO
  
  Note that keyboards are stored in an array and are not freed (just
  "unregistered" by clearing some fields) so a race would be limited to
  obtaining stale information about an unregistered keyboard.
  
  Reported by:	CTurt

Modified:
  stable/10/sys/dev/vt/vt_core.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/vt/vt_core.c
==============================================================================
--- stable/10/sys/dev/vt/vt_core.c	Mon Aug  1 19:50:28 2016	(r303632)
+++ stable/10/sys/dev/vt/vt_core.c	Mon Aug  1 19:53:18 2016	(r303633)
@@ -2183,9 +2183,11 @@ skip_thunk:
 			return (EINVAL);
 
 		if (vw == vd->vd_curwindow) {
+			mtx_lock(&Giant);
 			kbd = kbd_get_keyboard(vd->vd_keyboard);
 			if (kbd != NULL)
 				vt_save_kbd_state(vw, kbd);
+			mtx_unlock(&Giant);
 		}
 
 		vi->m_num = vd->vd_curwindow->vw_number + 1;