svn commit: r262972 - head/sys/dev/usb/input

[Hans Petter Selasky]

Author: hselasky
Date: Mon Mar 10 08:52:30 2014
New Revision: 262972
URL: http://svnweb.freebsd.org/changeset/base/262972

Log:
  Ignore USB keyboard driver calls from critical sections.
  
  Reported by:	Oliver Pinter <oliver.pntr at gmail.com>
  MFC after:	1 week

Modified:
  head/sys/dev/usb/input/ukbd.c

Modified: head/sys/dev/usb/input/ukbd.c
==============================================================================
--- head/sys/dev/usb/input/ukbd.c	Mon Mar 10 06:41:48 2014	(r262971)
+++ head/sys/dev/usb/input/ukbd.c	Mon Mar 10 08:52:30 2014	(r262972)
@@ -1909,6 +1909,12 @@ ukbd_ioctl(keyboard_t *kbd, u_long cmd, 
 	int result;
 
 	/*
+	 * XXX Check of someone is calling us from a critical section:
+	 */
+	if (curthread->td_critnest != 0)
+		return (EDEADLK);
+
+	/*
 	 * XXX KDGKBSTATE, KDSKBSTATE and KDSETLED can be called from any
 	 * context where printf(9) can be called, which among other things
 	 * includes interrupt filters and threads with any kinds of locks