From e9a1132f163c9d619480ef2ce58646f0ead585c2 Mon Sep 17 00:00:00 2001
From: glebius <glebius@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Tue, 17 May 2016 22:29:59 +0000
Subject: [PATCH] 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


git-svn-id: svn://svn.freebsd.org/base/stable/10@300091 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 sys/dev/kbd/kbd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c
index 803676288..f1a1b29ab 100644
--- a/sys/dev/kbd/kbd.c
+++ b/sys/dev/kbd/kbd.c
@@ -996,7 +996,7 @@ genkbd_commonioctl(keyboard_t *kbd, u_long cmd, caddr_t arg)
 			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;
-- 
2.45.0