mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-02 15:45:25 +00:00
Code Issues Releases Wiki Activity

pass the nodename to add32() instead of calling dns_rbt_fullnamefromnode()

Browse Source 
in addition to being more efficient, this prevents a possible crash by
looking up the node name before the tree sructure can be changed when
cleaning up dead nodes in addrdataset().
This commit is contained in:
Evan Hunt
2020-05-18 18:09:08 -07:00
parent f027763d3a
commit db9d10e3c1
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
lib/dns/rbtdb.c
View File

@@ -5958,14 +5958,14 @@ update_recordsandxfrsize(bool add, rbtdb_version_t *rbtversion,
} }
static isc_result_t static isc_result_t
add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion, add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, const dns_name_t *nodename,
rdatasetheader_t *newheader, unsigned int options, bool loading, rbtdb_version_t *rbtversion, rdatasetheader_t *newheader,
dns_rdataset_t *addedrdataset, isc_stdtime_t now) { unsigned int options, bool loading, dns_rdataset_t *addedrdataset,
isc_stdtime_t now) {
rbtdb_changed_t *changed = NULL; rbtdb_changed_t *changed = NULL;
rdatasetheader_t *topheader, *topheader_prev, *header, *sigheader; rdatasetheader_t *topheader = NULL, *topheader_prev = NULL;
dns_fixedname_t fname; rdatasetheader_t *header = NULL, *sigheader = NULL;
dns_name_t *nodename = dns_fixedname_initname(&fname); unsigned char *merged = NULL;
unsigned char *merged;
isc_result_t result; isc_result_t result;
bool header_nx; bool header_nx;
bool newheader_nx; bool newheader_nx;
@@ -5983,8 +5983,6 @@ add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
* Caller must be holding the node lock. * Caller must be holding the node lock.
*/ */
dns_rbt_fullnamefromnode(rbtnode, nodename);
if ((options & DNS_DBADD_MERGE) != 0) { if ((options & DNS_DBADD_MERGE) != 0) {
REQUIRE(rbtversion != NULL); REQUIRE(rbtversion != NULL);
merge = true; merge = true;
@@ -6668,7 +6666,7 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
name = dns_fixedname_initname(&fixed); name = dns_fixedname_initname(&fixed);
RWLOCK(&rbtdb->tree_lock, isc_rwlocktype_read); RWLOCK(&rbtdb->tree_lock, isc_rwlocktype_read);
dns_rbt_fullnamefromnode(node, name); dns_rbt_fullnamefromnode(rbtnode, name);
RWUNLOCK(&rbtdb->tree_lock, isc_rwlocktype_read); RWUNLOCK(&rbtdb->tree_lock, isc_rwlocktype_read);
dns_rdataset_getownercase(rdataset, name); dns_rdataset_getownercase(rdataset, name);
@@ -6761,10 +6759,11 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
RWUNLOCK(&rbtdb->tree_lock, isc_rwlocktype_read); RWUNLOCK(&rbtdb->tree_lock, isc_rwlocktype_read);
/* /*
* If we're adding a delegation type, adding to the auxiliary NSEC tree, * If we're adding a delegation type, adding to the auxiliary NSEC
* or the DB is a cache in an overmem state, hold an exclusive lock on * tree, or the DB is a cache in an overmem state, hold an
* the tree. In the latter case the lock does not necessarily have to * exclusive lock on the tree. In the latter case the lock does
* be acquired but it will help purge ancient entries more effectively. * not necessarily have to be acquired but it will help purge
* ancient entries more effectively.
*/ */
if (IS_CACHE(rbtdb) && isc_mem_isovermem(rbtdb->common.mctx)) { if (IS_CACHE(rbtdb) && isc_mem_isovermem(rbtdb->common.mctx)) {
cache_is_overmem = true; cache_is_overmem = true;
@@ -6811,7 +6810,6 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
if (newnsec) { if (newnsec) {
dns_rbtnode_t *nsecnode; dns_rbtnode_t *nsecnode;
dns_rbt_fullnamefromnode(rbtnode, name);
nsecnode = NULL; nsecnode = NULL;
result = dns_rbt_addnode(rbtdb->nsec, name, &nsecnode); result = dns_rbt_addnode(rbtdb->nsec, name, &nsecnode);
if (result == ISC_R_SUCCESS) { if (result == ISC_R_SUCCESS) {
@@ -6824,8 +6822,8 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
} }
if (result == ISC_R_SUCCESS) { if (result == ISC_R_SUCCESS) {
result = add32(rbtdb, rbtnode, rbtversion, newheader, options, result = add32(rbtdb, rbtnode, name, rbtversion, newheader,
false, addedrdataset, now); options, false, addedrdataset, now);
} }
if (result == ISC_R_SUCCESS && delegating) { if (result == ISC_R_SUCCESS && delegating) {
rbtnode->find_callback = 1; rbtnode->find_callback = 1;
@@ -7080,6 +7078,8 @@ deleterdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db;
dns_rbtnode_t *rbtnode = (dns_rbtnode_t *)node; dns_rbtnode_t *rbtnode = (dns_rbtnode_t *)node;
rbtdb_version_t *rbtversion = version; rbtdb_version_t *rbtversion = version;
dns_fixedname_t fname;
dns_name_t *nodename = dns_fixedname_initname(&fname);
isc_result_t result; isc_result_t result;
rdatasetheader_t *newheader; rdatasetheader_t *newheader;
@@ -7116,8 +7116,9 @@ deleterdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
NODE_LOCK(&rbtdb->node_locks[rbtnode->locknum].lock, NODE_LOCK(&rbtdb->node_locks[rbtnode->locknum].lock,
isc_rwlocktype_write); isc_rwlocktype_write);
result = add32(rbtdb, rbtnode, rbtversion, newheader, DNS_DBADD_FORCE, dns_rbt_fullnamefromnode(rbtnode, nodename);
false, NULL, 0); result = add32(rbtdb, rbtnode, nodename, rbtversion, newheader,
DNS_DBADD_FORCE, false, NULL, 0);
NODE_UNLOCK(&rbtdb->node_locks[rbtnode->locknum].lock, NODE_UNLOCK(&rbtdb->node_locks[rbtnode->locknum].lock,
isc_rwlocktype_write); isc_rwlocktype_write);
@@ -7324,7 +7325,7 @@ loading_addrdataset(void *arg, const dns_name_t *name,
NODE_LOCK(&rbtdb->node_locks[node->locknum].lock, isc_rwlocktype_write); NODE_LOCK(&rbtdb->node_locks[node->locknum].lock, isc_rwlocktype_write);
result = add32(rbtdb, node, rbtdb->current_version, newheader, result = add32(rbtdb, node, name, rbtdb->current_version, newheader,
DNS_DBADD_MERGE, true, NULL, 0); DNS_DBADD_MERGE, true, NULL, 0);
NODE_UNLOCK(&rbtdb->node_locks[node->locknum].lock, NODE_UNLOCK(&rbtdb->node_locks[node->locknum].lock,