2823. [bug] rbtdb.c:getsigningtime() was missing locks. [RT #20781]

diff --git a/CHANGES b/CHANGES
index 5c9b839c7db7a9bf9b14a07d1a3f19b6b8b11711..ac9e83156582c63cd393f42654e0d54ce5b7f52b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2823.  [bug]           rbtdb.c:getsigningtime() was missing locks. [RT #20781]
+
 2822.  [bug]           rbtdb.c:loadnode() could return the wrong result.
                        [RT #20802]
 

diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index f0f2cac1f5f9ac9ae8a5646a192c30dc72800bb6..c8c8c5fe841c50d584f5cdabc85c50659d48d492 100644 (file)
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbtdb.c,v 1.294 2009/12/29 08:53:33 marka Exp $ */
+/* $Id: rbtdb.c,v 1.295 2009/12/29 22:04:16 marka Exp $ */
 
 /*! \file */
 
@@ -6952,27 +6952,35 @@ getsigningtime(dns_db_t *db, dns_rdataset_t *rdataset,
        rdatasetheader_t *header = NULL, *this;
        unsigned int i;
        isc_result_t result = ISC_R_NOTFOUND;
+       unsigned int locknum;
 
        REQUIRE(VALID_RBTDB(rbtdb));
 
        RBTDB_LOCK(&rbtdb->lock, isc_rwlocktype_read);
 
        for (i = 0; i < rbtdb->node_lock_count; i++) {
+               NODE_LOCK(&rbtdb->node_locks[i].lock, isc_rwlocktype_read);
                this = isc_heap_element(rbtdb->heaps[i], 1);
-               if (this == NULL)
+               if (this == NULL) {
+                       NODE_UNLOCK(&rbtdb->node_locks[i].lock,
+                                   isc_rwlocktype_read);
                        continue;
+               }
                if (header == NULL)
                        header = this;
-               else if (isc_serial_lt(this->resign, header->resign))
+               else if (isc_serial_lt(this->resign, header->resign)) {
+                       locknum = header->node->locknum;
+                       NODE_UNLOCK(&rbtdb->node_locks[locknum].lock,
+                                   isc_rwlocktype_read);
                        header = this;
+               } else
+                       NODE_UNLOCK(&rbtdb->node_locks[i].lock,
+                                   isc_rwlocktype_read);
        }
 
        if (header == NULL)
                goto unlock;
 
-       NODE_LOCK(&rbtdb->node_locks[header->node->locknum].lock,
-                 isc_rwlocktype_read);
-
        bind_rdataset(rbtdb, header->node, header, 0, rdataset);
 
        if (foundname != NULL)