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

Fix nxdomain-redirect assertion failure

Browse Source 
- Always set is_zonep in query_getdb; previously it was only set if
  result was ISC_R_SUCCESS or ISC_R_NOTFOUND.
- Don't reset is_zone for redirect.
- Style cleanup.

(cherry picked from commit a85cc641d7a4c66cbde03cc4e31edc038a24df46)
This commit is contained in:
Matthijs Mekking
2019-02-26 15:55:29 +01:00
committed by Evan Hunt
parent 05d29443eb
commit 486a201149
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/ns/query.c
View File

@@ -1312,7 +1312,6 @@ query_getdb(ns_client_t *client, dns_name_t *name, dns_rdatatype_t qtype,
dns_dbversion_t **versionp, bool *is_zonep) dns_dbversion_t **versionp, bool *is_zonep)
{ {
isc_result_t result; isc_result_t result;
isc_result_t tresult; isc_result_t tresult;
unsigned int namelabels; unsigned int namelabels;
unsigned int zonelabels; unsigned int zonelabels;
@@ -1329,8 +1328,9 @@ query_getdb(ns_client_t *client, dns_name_t *name, dns_rdatatype_t qtype,
dbp, versionp); dbp, versionp);
/* See how many labels are in the zone's name. */ /* See how many labels are in the zone's name. */
if (result == ISC_R_SUCCESS && zone != NULL) if (result == ISC_R_SUCCESS && zone != NULL) {
zonelabels = dns_name_countlabels(dns_zone_getorigin(zone)); zonelabels = dns_name_countlabels(dns_zone_getorigin(zone));
}
/* /*
* If # zone labels < # name labels, try to find an even better match * If # zone labels < # name labels, try to find an even better match
@@ -1397,8 +1397,11 @@ query_getdb(ns_client_t *client, dns_name_t *name, dns_rdatatype_t qtype,
* If neither attempt above succeeded, return the cache instead * If neither attempt above succeeded, return the cache instead
*/ */
*is_zonep = true; *is_zonep = true;
} else if (result == ISC_R_NOTFOUND) { } else {
result = query_getcachedb(client, name, qtype, dbp, options); if (result == ISC_R_NOTFOUND) {
result = query_getcachedb(client, name, qtype, dbp,
options);
}
*is_zonep = false; *is_zonep = false;
} }
return (result); return (result);
@@ -4677,11 +4680,13 @@ redirect2(ns_client_t *client, dns_name_t *name, dns_rdataset_t *rdataset,
CTRACE(ISC_LOG_DEBUG(3), "redirect2"); CTRACE(ISC_LOG_DEBUG(3), "redirect2");
if (client->view->redirectzone == NULL) if (client->view->redirectzone == NULL) {
return (ISC_R_NOTFOUND); return (ISC_R_NOTFOUND);
}
if (dns_name_issubdomain(name, client->view->redirectzone)) if (dns_name_issubdomain(name, client->view->redirectzone)) {
return (ISC_R_NOTFOUND); return (ISC_R_NOTFOUND);
}
found = dns_fixedname_initname(&fixed); found = dns_fixedname_initname(&fixed);
dns_rdataset_init(&trdataset); dns_rdataset_init(&trdataset);
@@ -4689,8 +4694,9 @@ redirect2(ns_client_t *client, dns_name_t *name, dns_rdataset_t *rdataset,
dns_clientinfomethods_init(&cm, ns_client_sourceip); dns_clientinfomethods_init(&cm, ns_client_sourceip);
dns_clientinfo_init(&ci, client, NULL); dns_clientinfo_init(&ci, client, NULL);
if (WANTDNSSEC(client) && dns_db_iszone(*dbp) && dns_db_issecure(*dbp)) if (WANTDNSSEC(client) && dns_db_iszone(*dbp) && dns_db_issecure(*dbp)) {
return (ISC_R_NOTFOUND); return (ISC_R_NOTFOUND);
}
if (WANTDNSSEC(client) && dns_rdataset_isassociated(rdataset)) { if (WANTDNSSEC(client) && dns_rdataset_isassociated(rdataset)) {
if (rdataset->trust == dns_trust_secure) if (rdataset->trust == dns_trust_secure)
@@ -4727,16 +4733,19 @@ redirect2(ns_client_t *client, dns_name_t *name, dns_rdataset_t *rdataset,
redirectname, NULL); redirectname, NULL);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
return (ISC_R_NOTFOUND); return (ISC_R_NOTFOUND);
} else } else {
dns_name_copy(redirectname, client->view->redirectzone, NULL); dns_name_copy(redirectname, client->view->redirectzone, NULL);
}
options = 0; options = 0;
result = query_getdb(client, redirectname, qtype, options, &zone, result = query_getdb(client, redirectname, qtype, options, &zone,
&db, &version, &is_zone); &db, &version, &is_zone);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS) {
return (ISC_R_NOTFOUND); return (ISC_R_NOTFOUND);
if (zone != NULL) }
if (zone != NULL) {
dns_zone_detach(&zone); dns_zone_detach(&zone);
}
/* /*
* Lookup the requested data in the redirect zone. * Lookup the requested data in the redirect zone.
@@ -5394,7 +5403,6 @@ query_lookup(query_ctx_t *qctx) {
return (ns_query_done(qctx)); return (ns_query_done(qctx));
} }
} }
return (query_gotanswer(qctx, result)); return (query_gotanswer(qctx, result));
cleanup: cleanup:
@@ -5786,7 +5794,6 @@ query_resume(query_ctx_t *qctx) {
RESTORE(qctx->zone, qctx->client->query.redirect.zone); RESTORE(qctx->zone, qctx->client->query.redirect.zone);
qctx->authoritative = qctx->authoritative =
qctx->client->query.redirect.authoritative; qctx->client->query.redirect.authoritative;
qctx->is_zone = qctx->client->query.redirect.is_zone;
/* /*
* Free resources used while recursing. * Free resources used while recursing.
@@ -5895,7 +5902,6 @@ query_resume(query_ctx_t *qctx) {
ISC_EVENT_PTR(&qctx->event), &qctx->event); ISC_EVENT_PTR(&qctx->event), &qctx->event);
} else if (REDIRECT(qctx->client)) { } else if (REDIRECT(qctx->client)) {
result = qctx->client->query.redirect.result; result = qctx->client->query.redirect.result;
qctx->is_zone = qctx->client->query.redirect.is_zone;
} else { } else {
result = qctx->event->result; result = qctx->event->result;
} }