From owner-svn-src-all@freebsd.org Tue May 17 22:28:21 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AA671B4059F; Tue, 17 May 2016 22:28:21 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6F1701CE8; Tue, 17 May 2016 22:28:21 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4HMSK2N012022; Tue, 17 May 2016 22:28:20 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4HMSKxO012018; Tue, 17 May 2016 22:28:20 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201605172228.u4HMSKxO012018@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Tue, 17 May 2016 22:28:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r300086 - in releng/10.2: . sys/conf sys/dev/kbd sys/kern X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 May 2016 22:28:21 -0000 Author: glebius Date: Tue May 17 22:28:20 2016 New Revision: 300086 URL: https://svnweb.freebsd.org/changeset/base/300086 Log: - 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 Approved by: so Modified: releng/10.2/UPDATING releng/10.2/sys/conf/newvers.sh releng/10.2/sys/dev/kbd/kbd.c releng/10.2/sys/kern/uipc_syscalls.c Modified: releng/10.2/UPDATING ============================================================================== --- releng/10.2/UPDATING Tue May 17 22:28:11 2016 (r300085) +++ releng/10.2/UPDATING Tue May 17 22:28:20 2016 (r300086) @@ -16,6 +16,13 @@ from older versions of FreeBSD, try WITH 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 Modified: releng/10.2/sys/conf/newvers.sh ============================================================================== --- releng/10.2/sys/conf/newvers.sh Tue May 17 22:28:11 2016 (r300085) +++ releng/10.2/sys/conf/newvers.sh Tue May 17 22:28:20 2016 (r300086) @@ -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 Modified: releng/10.2/sys/dev/kbd/kbd.c ============================================================================== --- releng/10.2/sys/dev/kbd/kbd.c Tue May 17 22:28:11 2016 (r300085) +++ releng/10.2/sys/dev/kbd/kbd.c Tue May 17 22:28:20 2016 (r300086) @@ -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; Modified: releng/10.2/sys/kern/uipc_syscalls.c ============================================================================== --- releng/10.2/sys/kern/uipc_syscalls.c Tue May 17 22:28:11 2016 (r300085) +++ releng/10.2/sys/kern/uipc_syscalls.c Tue May 17 22:28:20 2016 (r300086) @@ -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)