mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 14:35:26 +00:00
Code Issues Releases Wiki Activity

[9.20] fix: dev: Fix dns_qp_insert() checks in qpzone

Browse Source 
Remove code in the QP zone database to handle failures of `dns_qp_insert()` which can't actually happen.

Closes #5171

Backport of MR !10088

Merge branch 'backport-5171-qpzone-insert-checks-9.20' into 'bind-9.20'

See merge request isc-projects/bind9!10114
This commit is contained in:
Evan Hunt
2025-02-18 08:02:05 +00:00
parent 5aa7a451cc a21168a221
commit 11cc40ebf6
1 changed files with 26 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
lib/dns/qpzone.c
View File

@@ -635,15 +635,10 @@ dns__qpzone_create(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type,
dns_qpmulti_write(qpdb->tree, &qp); dns_qpmulti_write(qpdb->tree, &qp);
qpdb->origin = new_qpznode(qpdb, &qpdb->common.origin); qpdb->origin = new_qpznode(qpdb, &qpdb->common.origin);
result = dns_qp_insert(qp, qpdb->origin, 0); result = dns_qp_insert(qp, qpdb->origin, 0);
INSIST(result == ISC_R_SUCCESS);
qpdb->origin->nsec = DNS_DB_NSEC_NORMAL; qpdb->origin->nsec = DNS_DB_NSEC_NORMAL;
dns_qpmulti_commit(qpdb->tree, &qp); dns_qpmulti_commit(qpdb->tree, &qp);
if (result != ISC_R_SUCCESS) {
INSIST(result != ISC_R_EXISTS);
qpzonedb_detach(&qpdb);
return result;
}
/* /*
* Add an apex node to the NSEC3 tree so that NSEC3 searches * Add an apex node to the NSEC3 tree so that NSEC3 searches
* return partial matches when there is only a single NSEC3 * return partial matches when there is only a single NSEC3
@@ -653,14 +648,9 @@ dns__qpzone_create(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type,
qpdb->nsec3_origin = new_qpznode(qpdb, &qpdb->common.origin); qpdb->nsec3_origin = new_qpznode(qpdb, &qpdb->common.origin);
qpdb->nsec3_origin->nsec = DNS_DB_NSEC_NSEC3; qpdb->nsec3_origin->nsec = DNS_DB_NSEC_NSEC3;
result = dns_qp_insert(qp, qpdb->nsec3_origin, 0); result = dns_qp_insert(qp, qpdb->nsec3_origin, 0);
INSIST(result == ISC_R_SUCCESS);
dns_qpmulti_commit(qpdb->nsec3, &qp); dns_qpmulti_commit(qpdb->nsec3, &qp);
if (result != ISC_R_SUCCESS) {
INSIST(result != ISC_R_EXISTS);
qpzonedb_detach(&qpdb);
return result;
}
/* /*
* Keep the current version in the open list so that list operation * Keep the current version in the open list so that list operation
* won't happen in normal lookup operations. * won't happen in normal lookup operations.
@@ -1630,13 +1620,14 @@ loading_addnode(qpz_load_t *loadctx, const dns_name_t *name,
* We're adding an NSEC record, so create a node in the nsec tree * We're adding an NSEC record, so create a node in the nsec tree
* too. This tree speeds searches for closest NSECs that would * too. This tree speeds searches for closest NSECs that would
* otherwise need to examine many irrelevant nodes in large TLDs. * otherwise need to examine many irrelevant nodes in large TLDs.
* If dns_qp_insert() fails, it means there's already an NSEC
* node there, so we can just detach the new one we created and
* move on.
*/ */
nsecnode = new_qpznode(qpdb, name);
result = dns_qp_insert(loadctx->nsec, nsecnode, 0);
node->nsec = DNS_DB_NSEC_HAS_NSEC; node->nsec = DNS_DB_NSEC_HAS_NSEC;
if (result == ISC_R_SUCCESS) { nsecnode = new_qpznode(qpdb, name);
nsecnode->nsec = DNS_DB_NSEC_NSEC; nsecnode->nsec = DNS_DB_NSEC_NSEC;
} (void)dns_qp_insert(loadctx->nsec, nsecnode, 0);
qpznode_detach(&nsecnode); qpznode_detach(&nsecnode);
done: done:
@@ -2467,9 +2458,9 @@ findnodeintree(qpzonedb_t *qpdb, const dns_name_t *name, bool create,
node = new_qpznode(qpdb, name); node = new_qpznode(qpdb, name);
result = dns_qp_insert(qp, node, 0); result = dns_qp_insert(qp, node, 0);
INSIST(result == ISC_R_SUCCESS);
qpznode_unref(node); qpznode_unref(node);
if (result == ISC_R_SUCCESS) {
if (nsec3) { if (nsec3) {
node->nsec = DNS_DB_NSEC_NSEC3; node->nsec = DNS_DB_NSEC_NSEC3;
} else { } else {
@@ -2481,7 +2472,6 @@ findnodeintree(qpzonedb_t *qpdb, const dns_name_t *name, bool create,
} }
INSIST(node->nsec == DNS_DB_NSEC_NSEC3 || !nsec3); INSIST(node->nsec == DNS_DB_NSEC_NSEC3 || !nsec3);
}
qpznode_acquire(qpdb, node DNS__DB_FLARG_PASS); qpznode_acquire(qpdb, node DNS__DB_FLARG_PASS);
@@ -4654,15 +4644,16 @@ addrdataset(dns_db_t *db, dns_dbnode_t *dbnode, dns_dbversion_t *dbversion,
result = ISC_R_SUCCESS; result = ISC_R_SUCCESS;
if (nsec != NULL) { if (nsec != NULL) {
node->nsec = DNS_DB_NSEC_HAS_NSEC;
/*
* If it fails, there was already an NSEC node,
* so we can detach the new one we created and
* move on.
*/
qpznode_t *nsecnode = new_qpznode(qpdb, name); qpznode_t *nsecnode = new_qpznode(qpdb, name);
result = dns_qp_insert(nsec, nsecnode, 0);
if (result == ISC_R_SUCCESS) {
nsecnode->nsec = DNS_DB_NSEC_NSEC; nsecnode->nsec = DNS_DB_NSEC_NSEC;
node->nsec = DNS_DB_NSEC_HAS_NSEC; (void)dns_qp_insert(nsec, nsecnode, 0);
} else if (result == ISC_R_EXISTS) {
node->nsec = DNS_DB_NSEC_HAS_NSEC;
result = ISC_R_SUCCESS;
}
qpznode_detach(&nsecnode); qpznode_detach(&nsecnode);
} }