svn commit: r300093 - stable/9/sys/dev/kbd

[Gleb Smirnoff]

Author: glebius
Date: Tue May 17 22:31:12 2016
New Revision: 300093
URL: https://svnweb.freebsd.org/changeset/base/300093

Log:
  Use unsigned version of min() when handling arguments of SETFKEY ioctl.
  
  Submitted by:	C Turt <cturt hardenedbsd.org>
  Security:	SA-16:18
  Security:	CVE-2016-1886

Modified:
  stable/9/sys/dev/kbd/kbd.c
Directory Properties:
  stable/9/   (props changed)
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/kbd/kbd.c
==============================================================================
--- stable/9/sys/dev/kbd/kbd.c	Tue May 17 22:30:43 2016	(r300092)
+++ stable/9/sys/dev/kbd/kbd.c	Tue May 17 22:31:12 2016	(r300093)
@@ -996,7 +996,7 @@ genkbd_commonioctl(keyboard_t *kbd, u_lo
 			splx(s);
 			return (error);
 		}
-		kbd->kb_fkeytab[fkeyp->keynum].len = imin(fkeyp->flen, MAXFK);
+		kbd->kb_fkeytab[fkeyp->keynum].len = min(fkeyp->flen, MAXFK);
 		bcopy(fkeyp->keydef, kbd->kb_fkeytab[fkeyp->keynum].str,
 		    kbd->kb_fkeytab[fkeyp->keynum].len);
 		break;