Date: Tue, 17 May 2016 22:28:42 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r300089 - head/sys/dev/kbd Message-ID: <201605172228.u4HMSgqf012174@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Tue May 17 22:28:42 2016 New Revision: 300089 URL: https://svnweb.freebsd.org/changeset/base/300089 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: head/sys/dev/kbd/kbd.c Modified: head/sys/dev/kbd/kbd.c ============================================================================== --- head/sys/dev/kbd/kbd.c Tue May 17 22:28:36 2016 (r300088) +++ head/sys/dev/kbd/kbd.c Tue May 17 22:28:42 2016 (r300089) @@ -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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605172228.u4HMSgqf012174>