From owner-svn-src-releng@freebsd.org Wed Nov 29 05:59:15 2017 Return-Path: Delivered-To: svn-src-releng@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 15AE9DF9454; Wed, 29 Nov 2017 05:59:15 +0000 (UTC) (envelope-from delphij@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 DDA68666D7; Wed, 29 Nov 2017 05:59:14 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAT5xD4V004623; Wed, 29 Nov 2017 05:59:13 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAT5xDMe004614; Wed, 29 Nov 2017 05:59:13 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201711290559.vAT5xDMe004614@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 29 Nov 2017 05:59:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r326358 - in releng: 11.0 11.0/crypto/openssl/crypto/bn/asm 11.0/crypto/openssl/crypto/x509v3 11.0/secure/lib/libcrypto/amd64 11.0/sys/conf 11.1 11.1/crypto/openssl/crypto/bn/asm 11.1/c... X-SVN-Group: releng X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: in releng: 11.0 11.0/crypto/openssl/crypto/bn/asm 11.0/crypto/openssl/crypto/x509v3 11.0/secure/lib/libcrypto/amd64 11.0/sys/conf 11.1 11.1/crypto/openssl/crypto/bn/asm 11.1/crypto/openssl/crypto/x509... X-SVN-Commit-Revision: 326358 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Nov 2017 05:59:15 -0000 Author: delphij Date: Wed Nov 29 05:59:12 2017 New Revision: 326358 URL: https://svnweb.freebsd.org/changeset/base/326358 Log: Fix multiple vulnerabilities of OpenSSL. Security: FreeBSD-SA-17:11 Approved by: so Modified: releng/11.0/UPDATING releng/11.0/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl releng/11.0/crypto/openssl/crypto/x509v3/v3_addr.c releng/11.0/secure/lib/libcrypto/amd64/x86_64-mont5.S releng/11.0/sys/conf/newvers.sh releng/11.1/UPDATING releng/11.1/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl releng/11.1/crypto/openssl/crypto/x509v3/v3_addr.c releng/11.1/secure/lib/libcrypto/amd64/x86_64-mont5.S Modified: releng/11.0/UPDATING ============================================================================== --- releng/11.0/UPDATING Wed Nov 29 05:35:28 2017 (r326357) +++ releng/11.0/UPDATING Wed Nov 29 05:59:12 2017 (r326358) @@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITHOUT_CLANG and the tip of head, and then rebuild without this option. The bootstrap process from older version of current across the gcc/clang cutover is a bit fragile. +20171129 p16 FreeBSD-SA-17:11.openssl + + Fix multiple vulnerabilities of OpenSSL. + 20171115 p15 FreeBSD-SA-17:08.ptrace FreeBSD-SA-17:10.kldstat Modified: releng/11.0/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl ============================================================================== --- releng/11.0/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl Wed Nov 29 05:35:28 2017 (r326357) +++ releng/11.0/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl Wed Nov 29 05:59:12 2017 (r326358) @@ -3090,11 +3090,19 @@ $code.=<<___; .align 32 .Lsqrx8x_break: - sub 16+8(%rsp),%r8 # consume last carry + xor $zero,$zero + sub 16+8(%rsp),%rbx # mov 16(%rsp),%cf + adcx $zero,%r8 mov 24+8(%rsp),$carry # initial $tptr, borrow $carry + adcx $zero,%r9 mov 0*8($aptr),%rdx # a[8], modulo-scheduled - xor %ebp,%ebp # xor $zero,$zero + adc \$0,%r10 mov %r8,0*8($tptr) + adc \$0,%r11 + adc \$0,%r12 + adc \$0,%r13 + adc \$0,%r14 + adc \$0,%r15 cmp $carry,$tptr # cf=0, of=0 je .Lsqrx8x_outer_loop Modified: releng/11.0/crypto/openssl/crypto/x509v3/v3_addr.c ============================================================================== --- releng/11.0/crypto/openssl/crypto/x509v3/v3_addr.c Wed Nov 29 05:35:28 2017 (r326357) +++ releng/11.0/crypto/openssl/crypto/x509v3/v3_addr.c Wed Nov 29 05:59:12 2017 (r326358) @@ -130,10 +130,12 @@ static int length_from_afi(const unsigned afi) */ unsigned int v3_addr_get_afi(const IPAddressFamily *f) { - return ((f != NULL && - f->addressFamily != NULL && f->addressFamily->data != NULL) - ? ((f->addressFamily->data[0] << 8) | (f->addressFamily->data[1])) - : 0); + if (f == NULL + || f->addressFamily == NULL + || f->addressFamily->data == NULL + || f->addressFamily->length < 2) + return 0; + return (f->addressFamily->data[0] << 8) | f->addressFamily->data[1]; } /* Modified: releng/11.0/secure/lib/libcrypto/amd64/x86_64-mont5.S ============================================================================== --- releng/11.0/secure/lib/libcrypto/amd64/x86_64-mont5.S Wed Nov 29 05:35:28 2017 (r326357) +++ releng/11.0/secure/lib/libcrypto/amd64/x86_64-mont5.S Wed Nov 29 05:59:12 2017 (r326358) @@ -3077,11 +3077,19 @@ __bn_sqrx8x_internal: .align 32 .Lsqrx8x_break: - subq 16+8(%rsp),%r8 + xorq %rbp,%rbp + subq 16+8(%rsp),%rbx + adcxq %rbp,%r8 movq 24+8(%rsp),%rcx + adcxq %rbp,%r9 movq 0(%rsi),%rdx - xorl %ebp,%ebp + adcq $0,%r10 movq %r8,0(%rdi) + adcq $0,%r11 + adcq $0,%r12 + adcq $0,%r13 + adcq $0,%r14 + adcq $0,%r15 cmpq %rcx,%rdi je .Lsqrx8x_outer_loop Modified: releng/11.0/sys/conf/newvers.sh ============================================================================== --- releng/11.0/sys/conf/newvers.sh Wed Nov 29 05:35:28 2017 (r326357) +++ releng/11.0/sys/conf/newvers.sh Wed Nov 29 05:59:12 2017 (r326358) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="11.0" -BRANCH="RELEASE-p15" +BRANCH="RELEASE-p16" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/11.1/UPDATING ============================================================================== --- releng/11.1/UPDATING Wed Nov 29 05:35:28 2017 (r326357) +++ releng/11.1/UPDATING Wed Nov 29 05:59:12 2017 (r326358) @@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITHOUT_CLANG and the tip of head, and then rebuild without this option. The bootstrap process from older version of current across the gcc/clang cutover is a bit fragile. +20171129 p5 FreeBSD-SA-17:11.openssl + + Fix multiple vulnerabilities of OpenSSL. + 20171115 p4 FreeBSD-SA-17:08.ptrace FreeBSD-SA-17:10.kldstat Modified: releng/11.1/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl ============================================================================== --- releng/11.1/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl Wed Nov 29 05:35:28 2017 (r326357) +++ releng/11.1/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl Wed Nov 29 05:59:12 2017 (r326358) @@ -3090,11 +3090,19 @@ $code.=<<___; .align 32 .Lsqrx8x_break: - sub 16+8(%rsp),%r8 # consume last carry + xor $zero,$zero + sub 16+8(%rsp),%rbx # mov 16(%rsp),%cf + adcx $zero,%r8 mov 24+8(%rsp),$carry # initial $tptr, borrow $carry + adcx $zero,%r9 mov 0*8($aptr),%rdx # a[8], modulo-scheduled - xor %ebp,%ebp # xor $zero,$zero + adc \$0,%r10 mov %r8,0*8($tptr) + adc \$0,%r11 + adc \$0,%r12 + adc \$0,%r13 + adc \$0,%r14 + adc \$0,%r15 cmp $carry,$tptr # cf=0, of=0 je .Lsqrx8x_outer_loop Modified: releng/11.1/crypto/openssl/crypto/x509v3/v3_addr.c ============================================================================== --- releng/11.1/crypto/openssl/crypto/x509v3/v3_addr.c Wed Nov 29 05:35:28 2017 (r326357) +++ releng/11.1/crypto/openssl/crypto/x509v3/v3_addr.c Wed Nov 29 05:59:12 2017 (r326358) @@ -130,10 +130,12 @@ static int length_from_afi(const unsigned afi) */ unsigned int v3_addr_get_afi(const IPAddressFamily *f) { - return ((f != NULL && - f->addressFamily != NULL && f->addressFamily->data != NULL) - ? ((f->addressFamily->data[0] << 8) | (f->addressFamily->data[1])) - : 0); + if (f == NULL + || f->addressFamily == NULL + || f->addressFamily->data == NULL + || f->addressFamily->length < 2) + return 0; + return (f->addressFamily->data[0] << 8) | f->addressFamily->data[1]; } /* Modified: releng/11.1/secure/lib/libcrypto/amd64/x86_64-mont5.S ============================================================================== --- releng/11.1/secure/lib/libcrypto/amd64/x86_64-mont5.S Wed Nov 29 05:35:28 2017 (r326357) +++ releng/11.1/secure/lib/libcrypto/amd64/x86_64-mont5.S Wed Nov 29 05:59:12 2017 (r326358) @@ -3077,11 +3077,19 @@ __bn_sqrx8x_internal: .align 32 .Lsqrx8x_break: - subq 16+8(%rsp),%r8 + xorq %rbp,%rbp + subq 16+8(%rsp),%rbx + adcxq %rbp,%r8 movq 24+8(%rsp),%rcx + adcxq %rbp,%r9 movq 0(%rsi),%rdx - xorl %ebp,%ebp + adcq $0,%r10 movq %r8,0(%rdi) + adcq $0,%r11 + adcq $0,%r12 + adcq $0,%r13 + adcq $0,%r14 + adcq $0,%r15 cmpq %rcx,%rdi je .Lsqrx8x_outer_loop From owner-svn-src-releng@freebsd.org Wed Nov 29 05:59:52 2017 Return-Path: Delivered-To: svn-src-releng@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 4DF96DF94B4; Wed, 29 Nov 2017 05:59:52 +0000 (UTC) (envelope-from delphij@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 281186680B; Wed, 29 Nov 2017 05:59:52 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAT5xp9e004700; Wed, 29 Nov 2017 05:59:51 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAT5xoTV004694; Wed, 29 Nov 2017 05:59:50 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201711290559.vAT5xoTV004694@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 29 Nov 2017 05:59:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r326359 - in releng: 10.3 10.3/crypto/openssl/crypto/x509v3 10.3/sys/conf 10.4 10.4/crypto/openssl/crypto/x509v3 10.4/sys/conf X-SVN-Group: releng X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: in releng: 10.3 10.3/crypto/openssl/crypto/x509v3 10.3/sys/conf 10.4 10.4/crypto/openssl/crypto/x509v3 10.4/sys/conf X-SVN-Commit-Revision: 326359 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Nov 2017 05:59:52 -0000 Author: delphij Date: Wed Nov 29 05:59:50 2017 New Revision: 326359 URL: https://svnweb.freebsd.org/changeset/base/326359 Log: Fix OpenSSL out-of-bounds read vulnerability. Security: FreeBSD-SA-17:11 Approved by: so Modified: releng/10.3/UPDATING releng/10.3/crypto/openssl/crypto/x509v3/v3_addr.c releng/10.3/sys/conf/newvers.sh releng/10.4/UPDATING releng/10.4/crypto/openssl/crypto/x509v3/v3_addr.c releng/10.4/sys/conf/newvers.sh Modified: releng/10.3/UPDATING ============================================================================== --- releng/10.3/UPDATING Wed Nov 29 05:59:12 2017 (r326358) +++ releng/10.3/UPDATING Wed Nov 29 05:59:50 2017 (r326359) @@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITHOUT_CLANG to b stable/10, and then rebuild without this option. The bootstrap process from older version of current is a bit fragile. +20171129 p25 FreeBSD-SA-17:11.openssl + + Fix OpenSSL out-of-bounds read vulnerability. + 20171115 p24 FreeBSD-SA-17:08.ptrace FreeBSD-SA-17:09.shm FreeBSD-SA-17:10.kldstat Modified: releng/10.3/crypto/openssl/crypto/x509v3/v3_addr.c ============================================================================== --- releng/10.3/crypto/openssl/crypto/x509v3/v3_addr.c Wed Nov 29 05:59:12 2017 (r326358) +++ releng/10.3/crypto/openssl/crypto/x509v3/v3_addr.c Wed Nov 29 05:59:50 2017 (r326359) @@ -130,10 +130,12 @@ static int length_from_afi(const unsigned afi) */ unsigned int v3_addr_get_afi(const IPAddressFamily *f) { - return ((f != NULL && - f->addressFamily != NULL && f->addressFamily->data != NULL) - ? ((f->addressFamily->data[0] << 8) | (f->addressFamily->data[1])) - : 0); + if (f == NULL + || f->addressFamily == NULL + || f->addressFamily->data == NULL + || f->addressFamily->length < 2) + return 0; + return (f->addressFamily->data[0] << 8) | f->addressFamily->data[1]; } /* Modified: releng/10.3/sys/conf/newvers.sh ============================================================================== --- releng/10.3/sys/conf/newvers.sh Wed Nov 29 05:59:12 2017 (r326358) +++ releng/10.3/sys/conf/newvers.sh Wed Nov 29 05:59:50 2017 (r326359) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="10.3" -BRANCH="RELEASE-p24" +BRANCH="RELEASE-p25" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/10.4/UPDATING ============================================================================== --- releng/10.4/UPDATING Wed Nov 29 05:59:12 2017 (r326358) +++ releng/10.4/UPDATING Wed Nov 29 05:59:50 2017 (r326359) @@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITHOUT_CLANG to b stable/10, and then rebuild without this option. The bootstrap process from older version of current is a bit fragile. +20171129 p4 FreeBSD-SA-17:11.openssl + + Fix OpenSSL out-of-bounds read vulnerability. + 20171115 p3 FreeBSD-SA-17:08.ptrace FreeBSD-SA-17:09.shm FreeBSD-SA-17:10.kldstat Modified: releng/10.4/crypto/openssl/crypto/x509v3/v3_addr.c ============================================================================== --- releng/10.4/crypto/openssl/crypto/x509v3/v3_addr.c Wed Nov 29 05:59:12 2017 (r326358) +++ releng/10.4/crypto/openssl/crypto/x509v3/v3_addr.c Wed Nov 29 05:59:50 2017 (r326359) @@ -130,10 +130,12 @@ static int length_from_afi(const unsigned afi) */ unsigned int v3_addr_get_afi(const IPAddressFamily *f) { - return ((f != NULL && - f->addressFamily != NULL && f->addressFamily->data != NULL) - ? ((f->addressFamily->data[0] << 8) | (f->addressFamily->data[1])) - : 0); + if (f == NULL + || f->addressFamily == NULL + || f->addressFamily->data == NULL + || f->addressFamily->length < 2) + return 0; + return (f->addressFamily->data[0] << 8) | f->addressFamily->data[1]; } /* Modified: releng/10.4/sys/conf/newvers.sh ============================================================================== --- releng/10.4/sys/conf/newvers.sh Wed Nov 29 05:59:12 2017 (r326358) +++ releng/10.4/sys/conf/newvers.sh Wed Nov 29 05:59:50 2017 (r326359) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="10.4" -BRANCH="RELEASE-p3" +BRANCH="RELEASE-p4" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi From owner-svn-src-releng@freebsd.org Wed Nov 29 07:41:41 2017 Return-Path: Delivered-To: svn-src-releng@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 4045EDFBECE; Wed, 29 Nov 2017 07:41:41 +0000 (UTC) (envelope-from delphij@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 DF68769E42; Wed, 29 Nov 2017 07:41:40 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAT7fd9D047168; Wed, 29 Nov 2017 07:41:39 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAT7fdhf047167; Wed, 29 Nov 2017 07:41:39 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201711290741.vAT7fdhf047167@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 29 Nov 2017 07:41:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r326360 - releng/11.1/sys/conf X-SVN-Group: releng X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: releng/11.1/sys/conf X-SVN-Commit-Revision: 326360 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Nov 2017 07:41:41 -0000 Author: delphij Date: Wed Nov 29 07:41:39 2017 New Revision: 326360 URL: https://svnweb.freebsd.org/changeset/base/326360 Log: Bump patch level. Reported by: Franco Fichtner Approved by: so Modified: releng/11.1/sys/conf/newvers.sh Modified: releng/11.1/sys/conf/newvers.sh ============================================================================== --- releng/11.1/sys/conf/newvers.sh Wed Nov 29 05:59:50 2017 (r326359) +++ releng/11.1/sys/conf/newvers.sh Wed Nov 29 07:41:39 2017 (r326360) @@ -44,7 +44,7 @@ TYPE="FreeBSD" REVISION="11.1" -BRANCH="RELEASE-p4" +BRANCH="RELEASE-p5" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi