From owner-svn-src-all@freebsd.org Wed Aug 15 02:31:12 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E2DA1106EE77; Wed, 15 Aug 2018 02:31:11 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 951B273A16; Wed, 15 Aug 2018 02:31:11 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 765BD24147; Wed, 15 Aug 2018 02:31:11 +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 w7F2VBGM097221; Wed, 15 Aug 2018 02:31:11 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7F2VABY096059; Wed, 15 Aug 2018 02:31:10 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201808150231.w7F2VABY096059@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 15 Aug 2018 02:31:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r337829 - in releng/10.4: . contrib/wpa/src/rsn_supp share/man/man4 sys/conf X-SVN-Group: releng X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: in releng/10.4: . contrib/wpa/src/rsn_supp share/man/man4 sys/conf X-SVN-Commit-Revision: 337829 X-SVN-Commit-Repository: base 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.27 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: Wed, 15 Aug 2018 02:31:12 -0000 Author: delphij Date: Wed Aug 15 02:31:10 2018 New Revision: 337829 URL: https://svnweb.freebsd.org/changeset/base/337829 Log: Revis manual pages. [SA-18:08.tcp] Fix unauthenticated EAPOL-Key decryption vulnerability. [SA-18:11.hostapd] Approved by: so Modified: releng/10.4/UPDATING releng/10.4/contrib/wpa/src/rsn_supp/wpa.c releng/10.4/share/man/man4/tcp.4 releng/10.4/sys/conf/newvers.sh Modified: releng/10.4/UPDATING ============================================================================== --- releng/10.4/UPDATING Wed Aug 15 02:30:11 2018 (r337828) +++ releng/10.4/UPDATING Wed Aug 15 02:31:10 2018 (r337829) @@ -16,6 +16,15 @@ 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. + +20180814 p11 FreeBSD-SA-18:08.tcp [revised] + FreeBSD-SA-18:11.hostapd + + Revise manual pages. [SA-18:08.tcp] + + Fixeunauthenticated EAPOL-Key decryption vulnerability. + [SA-18:11.hostapd] + 20180806 p10 FreeBSD-SA-18:08.tcp Fix resource exhaustion in TCP reassembly. Modified: releng/10.4/contrib/wpa/src/rsn_supp/wpa.c ============================================================================== --- releng/10.4/contrib/wpa/src/rsn_supp/wpa.c Wed Aug 15 02:30:11 2018 (r337828) +++ releng/10.4/contrib/wpa/src/rsn_supp/wpa.c Wed Aug 15 02:31:10 2018 (r337829) @@ -1829,6 +1829,17 @@ int wpa_sm_rx_eapol(struct wpa_sm *sm, const u8 *src_a if (sm->proto == WPA_PROTO_RSN && (key_info & WPA_KEY_INFO_ENCR_KEY_DATA)) { + /* + * Only decrypt the Key Data field if the frame's authenticity + * was verified. When using AES-SIV (FILS), the MIC flag is not + * set, so this check should only be performed if mic_len != 0 + * which is the case in this code branch. + */ + if (!(key_info & WPA_KEY_INFO_MIC)) { + wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, + "WPA: Ignore EAPOL-Key with encrypted but unauthenticated data"); + goto out; + } if (wpa_supplicant_decrypt_key_data(sm, key, ver)) goto out; extra_len = WPA_GET_BE16(key->key_data_length); Modified: releng/10.4/share/man/man4/tcp.4 ============================================================================== --- releng/10.4/share/man/man4/tcp.4 Wed Aug 15 02:30:11 2018 (r337828) +++ releng/10.4/share/man/man4/tcp.4 Wed Aug 15 02:31:10 2018 (r337829) @@ -38,7 +38,7 @@ .\" From: @(#)tcp.4 8.1 (Berkeley) 6/5/93 .\" $FreeBSD$ .\" -.Dd October 13, 2014 +.Dd August 6, 2018 .Dt TCP 4 .Os .Sh NAME Modified: releng/10.4/sys/conf/newvers.sh ============================================================================== --- releng/10.4/sys/conf/newvers.sh Wed Aug 15 02:30:11 2018 (r337828) +++ releng/10.4/sys/conf/newvers.sh Wed Aug 15 02:31:10 2018 (r337829) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="10.4" -BRANCH="RELEASE-p10" +BRANCH="RELEASE-p11" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi