Author: glebius
Date: Tue May 17 22:29:59 2016
New Revision: 300091
URL: https://svnweb.freebsd.org/changeset/base/300091

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/10/sys/dev/kbd/kbd.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/kbd/kbd.c
==============================================================================
--- stable/10/sys/dev/kbd/kbd.c Tue May 17 22:28:53 2016        (r300090)
+++ stable/10/sys/dev/kbd/kbd.c Tue May 17 22:29:59 2016        (r300091)
@@ -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;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to