From owner-svn-src-all@freebsd.org Wed Jul 12 08:07:37 2017 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 A17BDDB5A11; Wed, 12 Jul 2017 08:07:37 +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 6E7E47E242; Wed, 12 Jul 2017 08:07:37 +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 v6C87a39057619; Wed, 12 Jul 2017 08:07:36 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6C87a8c057616; Wed, 12 Jul 2017 08:07:36 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201707120807.v6C87a8c057616@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 12 Jul 2017 08:07:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r320911 - in releng/11.0: . crypto/heimdal/lib/krb5 sys/conf X-SVN-Group: releng X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: in releng/11.0: . crypto/heimdal/lib/krb5 sys/conf X-SVN-Commit-Revision: 320911 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.23 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, 12 Jul 2017 08:07:37 -0000 Author: delphij Date: Wed Jul 12 08:07:36 2017 New Revision: 320911 URL: https://svnweb.freebsd.org/changeset/base/320911 Log: Fix heimdal KDC-REP service name validation vulnerability [SA-17:05] Approved by: so Modified: releng/11.0/UPDATING releng/11.0/crypto/heimdal/lib/krb5/ticket.c releng/11.0/sys/conf/newvers.sh Modified: releng/11.0/UPDATING ============================================================================== --- releng/11.0/UPDATING Wed Jul 12 08:07:16 2017 (r320910) +++ releng/11.0/UPDATING Wed Jul 12 08:07:36 2017 (r320911) @@ -16,7 +16,11 @@ 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. -20170427 p10 FreeBSD-SA-17:04.ipfilter +20170712 p11 FreeBSD-SA-17:05.heimdal + + Fix heimdal KDC-REP service name validation vulnerability. + +20170427 p10 FreeBSD-SA-17:04.ipfilter Fix ipfilter(4) fragment handling panic. [SA-17:04] Modified: releng/11.0/crypto/heimdal/lib/krb5/ticket.c ============================================================================== --- releng/11.0/crypto/heimdal/lib/krb5/ticket.c Wed Jul 12 08:07:16 2017 (r320910) +++ releng/11.0/crypto/heimdal/lib/krb5/ticket.c Wed Jul 12 08:07:36 2017 (r320911) @@ -713,8 +713,8 @@ _krb5_extract_ticket(krb5_context context, /* check server referral and save principal */ ret = _krb5_principalname2krb5_principal (context, &tmp_principal, - rep->kdc_rep.ticket.sname, - rep->kdc_rep.ticket.realm); + rep->enc_part.sname, + rep->enc_part.srealm); if (ret) goto out; if((flags & EXTRACT_TICKET_ALLOW_SERVER_MISMATCH) == 0){ Modified: releng/11.0/sys/conf/newvers.sh ============================================================================== --- releng/11.0/sys/conf/newvers.sh Wed Jul 12 08:07:16 2017 (r320910) +++ releng/11.0/sys/conf/newvers.sh Wed Jul 12 08:07:36 2017 (r320911) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="11.0" -BRANCH="RELEASE-p10" +BRANCH="RELEASE-p11" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi