From: Mark Andrews <marka@isc.org>
Date: Tue, 28 Jul 2009 14:18:08 +0000 (+0000)
Subject: 2640.   [security]      A specially crafted update packet will cause named
X-Git-Tag: v9.6.1-P1^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc3984cb3b3322e6797af99ded10023ebfab5671;p=thirdparty%2Fbind9.git

2640.   [security]      A specially crafted update packet will cause named
                        to exit. [RT #20000]
---

diff --git a/CHANGES b/CHANGES
index 2fc7dff3687..1f2c35a1411 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+	--- 9.6.1-P1 released ---
+
+2640.	[security]	A specially crafted update packet will cause named
+			to exit. [RT #20000]
 
 	--- 9.6.1 released ---
 
diff --git a/bin/named/update.c b/bin/named/update.c
index ff07311617c..b0a556d5cc4 100644
--- a/bin/named/update.c
+++ b/bin/named/update.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: update.c,v 1.151.12.5 2009/04/30 07:03:37 marka Exp $ */
+/* $Id: update.c,v 1.151.12.5.12.1 2009/07/28 14:18:08 marka Exp $ */
 
 #include <config.h>
 
@@ -979,7 +979,11 @@ temp_check(isc_mem_t *mctx, dns_diff_t *temp, dns_db_t *db,
 			if (type == dns_rdatatype_rrsig ||
 			    type == dns_rdatatype_sig)
 				covers = dns_rdata_covers(&t->rdata);
-			else
+			else if (type == dns_rdatatype_any) {
+				dns_db_detachnode(db, &node);
+				dns_diff_clear(&trash);
+				return (DNS_R_NXRRSET);
+			} else
 				covers = 0;
 
 			/*
diff --git a/version b/version
index 1b3080fc6f7..3245f02d3fd 100644
--- a/version
+++ b/version
@@ -1,4 +1,4 @@
-# $Id: version,v 1.43.12.5 2009/06/04 04:02:41 marka Exp $
+# $Id: version,v 1.43.12.5.8.1 2009/07/28 14:18:08 marka Exp $
 # 
 # This file must follow /bin/sh rules.  It is imported directly via
 # configure.
@@ -6,5 +6,5 @@
 MAJORVER=9
 MINORVER=6
 PATCHVER=1
-RELEASETYPE=
-RELEASEVER=
+RELEASETYPE=-P
+RELEASEVER=1