summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-05-17 20:44:35 -0300
committerRenato Botelho <renato@netgate.com>2016-05-17 20:44:35 -0300
commit3ef16fb22937fda756df399303c2a2b8ee053f4e (patch)
tree410f30e2b21a00404e2dec119a4a33d722439686
parent15713f264bde6f14058d95ec2a1c7a0665af2e54 (diff)
parent8a232783c3444677eb1faa3048123dda21767094 (diff)
downloadFreeBSD-src-3ef16fb22937fda756df399303c2a2b8ee053f4e.zip
FreeBSD-src-3ef16fb22937fda756df399303c2a2b8ee053f4e.tar.gz
Merge remote-tracking branch 'origin/releng/10.3' into RELENG_2_3_1
-rw-r--r--UPDATING7
-rw-r--r--sys/conf/newvers.sh2
-rw-r--r--sys/dev/kbd/kbd.c2
-rw-r--r--sys/kern/uipc_syscalls.c3
4 files changed, 12 insertions, 2 deletions
diff --git a/UPDATING b/UPDATING
index f6a5f2a..2a1249e 100644
--- a/UPDATING
+++ b/UPDATING
@@ -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 p3 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 p2 FreeBSD-SA-16:17.openssl
FreeBSD-EN-16:06.libc
FreeBSD-EN-16:07.ipi
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 5ad43e3..142bd8a 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="10.3"
-BRANCH="RELEASE-p2"
+BRANCH="RELEASE-p3"
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 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;
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index fa36849..97ca115 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)
OpenPOWER on IntegriCloud