mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 06:55:30 +00:00
Code Issues Releases Wiki Activity

Merge branch '1968-cleanup-dead-nodes-fix' into 'main'

Browse Source 
rbtdb: cleanup_dead_nodes should ignore alive nodes on the deadlist

Closes #1968

See merge request isc-projects/bind9!3773
This commit is contained in:
Ondřej Surý
2020-07-01 13:34:54 +00:00
parent dbd03ce112 4c12709da4
commit 7500fb9319
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@@ -1,3 +1,7 @@
5455. [bug] `named` could crash when cleaning dead nodes
in lib/dns/rbtdb.c that have been reused meanwhile.
[GL #1968]
5454. [bug] Address a startup crash happening when server is 5454. [bug] Address a startup crash happening when server is
under load and root zone is not yet loaded. [GL #1862] under load and root zone is not yet loaded. [GL #1862]

3
doc/notes/notes-current.rst
View File

@@ -68,3 +68,6 @@ Bug Fixes
- Fix assertion failure when server is under load and root zone is not yet - Fix assertion failure when server is under load and root zone is not yet
loaded. [GL #1862] loaded. [GL #1862]
- ``named`` could crash when cleaning dead nodes in ``lib/dns/rbtdb.c`` that
have been reused meanwhile. [GL #1968]

17
lib/dns/rbtdb.c
View File

@@ -1914,15 +1914,16 @@ cleanup_dead_nodes(dns_rbtdb_t *rbtdb, int bucketnum) {
ISC_LIST_UNLINK(rbtdb->deadnodes[bucketnum], node, deadlink); ISC_LIST_UNLINK(rbtdb->deadnodes[bucketnum], node, deadlink);
/* /*
* Since we're holding a tree write lock, it should be * We might have reactivated this node without a tree write
* impossible for this node to be referenced by others. * lock, so we couldn't remove this node from deadnodes then
* * and we have to do it now.
* decrement_reference may not have tested node->down, as
* the tree_lock was not held, before adding the node to
* deadnodes so we test it here.
*/ */
INSIST(isc_refcount_current(&node->references) == 0 && if (isc_refcount_current(&node->references) != 0 ||
node->data == NULL); node->data != NULL) {
node = ISC_LIST_HEAD(rbtdb->deadnodes[bucketnum]);
count--;
continue;
}
if (is_leaf(node) && rbtdb->task != NULL) { if (is_leaf(node) && rbtdb->task != NULL) {
send_to_prune_tree(rbtdb, node, isc_rwlocktype_write); send_to_prune_tree(rbtdb, node, isc_rwlocktype_write);