svn commit: r278972 - in stable/9/contrib/bind9: . lib/dns

[Xin LI]

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);
 		}