From owner-svn-src-releng@freebsd.org Thu Aug 10 06:59:27 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 B2BA9DC71FF; Thu, 10 Aug 2017 06:59:27 +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 8E35572C9A; Thu, 10 Aug 2017 06:59:27 +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 v7A6xQV2046113; Thu, 10 Aug 2017 06:59:26 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7A6xQjh046108; Thu, 10 Aug 2017 06:59:26 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201708100659.v7A6xQjh046108@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Thu, 10 Aug 2017 06:59:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r322343 - in releng/11.0: . crypto/openssh sys/conf sys/kern X-SVN-Group: releng X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: in releng/11.0: . crypto/openssh sys/conf sys/kern X-SVN-Commit-Revision: 322343 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.23 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: Thu, 10 Aug 2017 06:59:27 -0000 Author: delphij Date: Thu Aug 10 06:59:26 2017 New Revision: 322343 URL: https://svnweb.freebsd.org/changeset/base/322343 Log: Fix OpenSSH Denial of Service vulnerability. [SA-17:06] Fix VNET kernel panic with asynchronous I/O. [EN-17:07] Approved by: so Modified: releng/11.0/UPDATING releng/11.0/crypto/openssh/auth-passwd.c releng/11.0/sys/conf/newvers.sh releng/11.0/sys/kern/sys_socket.c Modified: releng/11.0/UPDATING ============================================================================== --- releng/11.0/UPDATING Thu Aug 10 06:59:07 2017 (r322342) +++ releng/11.0/UPDATING Thu Aug 10 06:59:26 2017 (r322343) @@ -16,6 +16,13 @@ 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. +20170810 p12 FreeBSD-SA-17:06.openssh + FreeBSD-EN-17:07.vnet + + Fix OpenSSH Denial of Service vulnerability. [SA-17:06] + + Fix VNET kernel panic with asynchronous I/O. [EN-17:07] + 20170712 p11 FreeBSD-SA-17:05.heimdal Fix heimdal KDC-REP service name validation vulnerability. Modified: releng/11.0/crypto/openssh/auth-passwd.c ============================================================================== --- releng/11.0/crypto/openssh/auth-passwd.c Thu Aug 10 06:59:07 2017 (r322342) +++ releng/11.0/crypto/openssh/auth-passwd.c Thu Aug 10 06:59:26 2017 (r322343) @@ -66,6 +66,8 @@ extern login_cap_t *lc; #define DAY (24L * 60 * 60) /* 1 day in seconds */ #define TWO_WEEKS (2L * 7 * DAY) /* 2 weeks in seconds */ +#define MAX_PASSWORD_LEN 1024 + void disable_forwarding(void) { @@ -86,6 +88,9 @@ auth_password(Authctxt *authctxt, const char *password #if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE) static int expire_checked = 0; #endif + + if (strlen(password) > MAX_PASSWORD_LEN) + return 0; #ifndef HAVE_CYGWIN if (pw->pw_uid == 0 && options.permit_root_login != PERMIT_YES) Modified: releng/11.0/sys/conf/newvers.sh ============================================================================== --- releng/11.0/sys/conf/newvers.sh Thu Aug 10 06:59:07 2017 (r322342) +++ releng/11.0/sys/conf/newvers.sh Thu Aug 10 06:59:26 2017 (r322343) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="11.0" -BRANCH="RELEASE-p11" +BRANCH="RELEASE-p12" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/11.0/sys/kern/sys_socket.c ============================================================================== --- releng/11.0/sys/kern/sys_socket.c Thu Aug 10 06:59:07 2017 (r322342) +++ releng/11.0/sys/kern/sys_socket.c Thu Aug 10 06:59:26 2017 (r322343) @@ -673,6 +673,7 @@ soaio_process_sb(struct socket *so, struct sockbuf *sb { struct kaiocb *job; + CURVNET_SET(so->so_vnet); SOCKBUF_LOCK(sb); while (!TAILQ_EMPTY(&sb->sb_aiojobq) && soaio_ready(so, sb)) { job = TAILQ_FIRST(&sb->sb_aiojobq); @@ -696,6 +697,7 @@ soaio_process_sb(struct socket *so, struct sockbuf *sb ACCEPT_LOCK(); SOCK_LOCK(so); sorele(so); + CURVNET_RESTORE(); } void