From owner-svn-src-all@freebsd.org  Tue Jul  7 21:43:24 2015
Return-Path: <owner-svn-src-all@freebsd.org>
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 8C950995E8A;
 Tue,  7 Jul 2015 21:43:24 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 7BD0E1A15;
 Tue,  7 Jul 2015 21:43:24 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t67LhOBX035141;
 Tue, 7 Jul 2015 21:43:24 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t67LhOop035140;
 Tue, 7 Jul 2015 21:43:24 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201507072143.t67LhOop035140@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Tue, 7 Jul 2015 21:43:24 +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: r285257 - in stable: 8/contrib/bind9/lib/dns
 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.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <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: Tue, 07 Jul 2015 21:43:24 -0000

Author: delphij
Date: Tue Jul  7 21:43:23 2015
New Revision: 285257
URL: https://svnweb.freebsd.org/changeset/base/285257

Log:
  Fix BIND resolver remote denial of service when validating.
  
  Security:	CVE-2015-4620
  Security:	FreeBSD-SA-15:11.bind

Modified:
  stable/9/contrib/bind9/lib/dns/validator.c

Changes in other areas also in this revision:
Modified:
  stable/8/contrib/bind9/lib/dns/validator.c

Modified: stable/9/contrib/bind9/lib/dns/validator.c
==============================================================================
--- stable/9/contrib/bind9/lib/dns/validator.c	Tue Jul  7 21:05:20 2015	(r285256)
+++ stable/9/contrib/bind9/lib/dns/validator.c	Tue Jul  7 21:43:23 2015	(r285257)
@@ -1420,7 +1420,6 @@ compute_keytag(dns_rdata_t *rdata, dns_r
  */
 static isc_boolean_t
 isselfsigned(dns_validator_t *val) {
-	dns_fixedname_t fixed;
 	dns_rdataset_t *rdataset, *sigrdataset;
 	dns_rdata_t rdata = DNS_RDATA_INIT;
 	dns_rdata_t sigrdata = DNS_RDATA_INIT;
@@ -1476,8 +1475,7 @@ isselfsigned(dns_validator_t *val) {
 			result = dns_dnssec_verify3(name, rdataset, dstkey,
 						    ISC_TRUE,
 						    val->view->maxbits,
-						    mctx, &sigrdata,
-						    dns_fixedname_name(&fixed));
+						    mctx, &sigrdata, NULL);
 			dst_key_free(&dstkey);
 			if (result != ISC_R_SUCCESS)
 				continue;