2640. [security] A specially crafted update packet will cause named

                        to exit. [RT #20000]

diff --git a/CHANGES b/CHANGES
index 2fc7dff36876de7152005e9b8def0dba0f910f49..1f2c35a1411361c9a4df66a3bf1620ea8803aeef 100644 (file)
--- 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 ff07311617c548e7d0d6aa56914d15d21e2e4e2a..b0a556d5cc417ace03a7869633da259f17627ae4 100644 (file)
--- 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 1b3080fc6f7829751376193bc21766a6bebd988d..3245f02d3fd8d97cce84e3b4c45c681a4e5f02ad 100644 (file)
--- 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