diff options
author | glebius <glebius@FreeBSD.org> | 2016-05-17 22:28:11 +0000 |
---|---|---|
committer | glebius <glebius@FreeBSD.org> | 2016-05-17 22:28:11 +0000 |
commit | d5c97915ca881f925236c58bd1704de34e4f183f (patch) | |
tree | a9e93a9b331346e43e655842470bfa914d95b8b6 /sys/dev | |
parent | 5430cc27b55026c3442ae5712f4c531c9c061915 (diff) | |
download | FreeBSD-src-d5c97915ca881f925236c58bd1704de34e4f183f.zip FreeBSD-src-d5c97915ca881f925236c58bd1704de34e4f183f.tar.gz |
- Use unsigned version of min() when handling arguments of SETFKEY ioctl.
- Validate that user supplied control message length in sendmsg(2)
is not negative.
Security: SA-16:18
Security: CVE-2016-1886
Security: SA-16:19
Security: CVE-2016-1887
Submitted by: C Turt <cturt hardenedbsd.org>
Approved by: so
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/kbd/kbd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c index 8036762..f1a1b29 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; |