From owner-svn-src-all@FreeBSD.ORG Wed Feb 18 22:20:20 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id BA68B9DD;
Wed, 18 Feb 2015 22:20:20 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 A50AC7A2;
Wed, 18 Feb 2015 22:20:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1IMKK6X038822;
Wed, 18 Feb 2015 22:20:20 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1IMKKpQ038820;
Wed, 18 Feb 2015 22:20:20 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201502182220.t1IMKKpQ038820@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: delphij set sender to
delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Wed, 18 Feb 2015 22:20:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r278972 - in stable/9/contrib/bind9: . lib/dns
X-SVN-Group: stable-9
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.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Feb 2015 22:20:20 -0000
Author: delphij
Date: Wed Feb 18 22:20:19 2015
New Revision: 278972
URL: https://svnweb.freebsd.org/changeset/base/278972
Log:
MFV r278971: Apply vendor fix for CVE-2015-1349.
This is a direct commit to stable/9 because BIND is removed from
HEAD.
Modified:
stable/9/contrib/bind9/CHANGES
stable/9/contrib/bind9/lib/dns/zone.c
Directory Properties:
stable/9/contrib/bind9/ (props changed)
Modified: stable/9/contrib/bind9/CHANGES
==============================================================================
--- stable/9/contrib/bind9/CHANGES Wed Feb 18 22:18:49 2015 (r278971)
+++ stable/9/contrib/bind9/CHANGES Wed Feb 18 22:20:19 2015 (r278972)
@@ -1,3 +1,10 @@
+ --- 9.9.6-P2 released ---
+
+4053. [security] Revoking a managed trust anchor and supplying
+ an untrusted replacement could cause named
+ to crash with an assertion failure.
+ (CVE-2015-1349) [RT #38344]
+
--- 9.9.6-P1 released ---
4006. [security] A flaw in delegation handling could be exploited
Modified: stable/9/contrib/bind9/lib/dns/zone.c
==============================================================================
--- stable/9/contrib/bind9/lib/dns/zone.c Wed Feb 18 22:18:49 2015 (r278971)
+++ stable/9/contrib/bind9/lib/dns/zone.c Wed Feb 18 22:20:19 2015 (r278972)
@@ -8508,6 +8508,12 @@ keyfetch_done(isc_task_t *task, isc_even
namebuf, tag);
trustkey = ISC_TRUE;
}
+ } else {
+ /*
+ * No previously known key, and the key is not
+ * secure, so skip it.
+ */
+ continue;
}
/* Delete old version */
@@ -8556,7 +8562,7 @@ keyfetch_done(isc_task_t *task, isc_even
trust_key(zone, keyname, &dnskey, mctx);
}
- if (!deletekey) {
+ if (secure && !deletekey) {
INSIST(newkey || updatekey);
set_refreshkeytimer(zone, &keydata, now);
}