diff options
| author | Gleb Smirnoff <glebius@FreeBSD.org> | 2016-05-17 22:28:20 +0000 |
|---|---|---|
| committer | Gleb Smirnoff <glebius@FreeBSD.org> | 2016-05-17 22:28:20 +0000 |
| commit | a6df401345b4ad6ca3055f3d3c3962333a11f6e8 (patch) | |
| tree | 3905e7b1d9e0d17c9657b59f8ad52020c98dfc3c | |
| parent | 0ffd370a4c7242c7a08b08da82577819ba32a89f (diff) | |
Notes
| -rw-r--r-- | UPDATING | 7 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 2 | ||||
| -rw-r--r-- | sys/dev/kbd/kbd.c | 2 | ||||
| -rw-r--r-- | sys/kern/uipc_syscalls.c | 3 |
4 files changed, 12 insertions, 2 deletions
@@ -16,6 +16,13 @@ from older versions of FreeBSD, try WITHOUT_CLANG to bootstrap to the tip of stable/10, and then rebuild without this option. The bootstrap process from older version of current is a bit fragile. +20160517 p17 FreeBSD-SA-16:18.atkbd + FreeBSD-SA-16:19.sendmsg + + Fix buffer overflow in keyboard driver. [SA-16:18] + + Fix incorrect argument handling in sendmsg(2). [SA-16:19] + 20160504 p16 FreeBSD-SA-16:17.openssl FreeBSD-EN-16:07.ipi FreeBSD-EN-16:08.zfs diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 97a120da6c7f..2d2b64e6af3a 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="10.2" -BRANCH="RELEASE-p16" +BRANCH="RELEASE-p17" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c index 803676288882..f1a1b29ab229 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; diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index 708457dbdfc5..a5053eea2c02 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -1787,6 +1787,9 @@ sockargs(mp, buf, buflen, type) struct mbuf *m; int error; + if (buflen < 0) + return (EINVAL); + if (buflen > MLEN) { #ifdef COMPAT_OLDSOCK if (type == MT_SONAME && buflen <= 112) |