diff options
| author | Renato Botelho <renato@netgate.com> | 2016-05-17 20:44:51 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-05-17 20:44:51 -0300 |
| commit | 41814fd21079b0bc65316a7a4678b1032d25cee6 (patch) | |
| tree | 410f30e2b21a00404e2dec119a4a33d722439686 /sys | |
| parent | 7170d3e134d43d3c22dc7be7a626d1b4cc5297a3 (diff) | |
| parent | 8a232783c3444677eb1faa3048123dda21767094 (diff) | |
| download | FreeBSD-src-41814fd21079b0bc65316a7a4678b1032d25cee6.zip FreeBSD-src-41814fd21079b0bc65316a7a4678b1032d25cee6.tar.gz | |
Merge remote-tracking branch 'origin/releng/10.3' into RELENG_2_3
Diffstat (limited to 'sys')
| -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 |
3 files changed, 5 insertions, 2 deletions
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) |
