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

Merge branch '4115-fix-extra-dns_validator-detach' into 'main'

Browse Source 
Fix extra detach when dns_validator create_fetch() detects deadlock

Closes #4115

See merge request isc-projects/bind9!8003
This commit is contained in:
Ondřej Surý
2023-06-06 17:34:22 +00:00
parent fbab2dd45f 1d03cac78a
commit 5bca79da1a
3 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@@ -1,3 +1,7 @@
6189. [bug] Fix an extra dns_validator deatch when encountering
deadling which would lead to assertion failure.
[GL #4115]
6188. [performance] Reduce memory consumption by allocating properly
sized send buffers for stream-based transports.
[GL #4038]

6
lib/dns/include/dns/validator.h
View File

@@ -165,7 +165,11 @@ dns_validator_create(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type,
/*%<
* Start a DNSSEC validation.
*
* This validates a response to the question given by
* On success (which is guaranteed as long as the view has valid
* trust anchors), `validatorp` is updated to point to the new
* validator. The caller is responsible for detaching it.
*
* The validator will validate a response to the question given by
* 'name' and 'type'.
*
* To validate a positive response, the response data is

37
lib/dns/validator.c
View File

@@ -926,6 +926,7 @@ static isc_result_t
create_fetch(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type,
isc_job_cb callback, const char *caller) {
unsigned int fopts = 0;
isc_result_t result;
disassociate_rdatasets(val);
@@ -946,10 +947,16 @@ create_fetch(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type,
validator_logcreate(val, name, type, caller, "fetch");
dns_validator_ref(val);
return (dns_resolver_createfetch(
result = dns_resolver_createfetch(
val->view->resolver, name, type, NULL, NULL, NULL, NULL, 0,
fopts, 0, NULL, val->loop, callback, val, &val->frdataset,
&val->fsigrdataset, &val->fetch));
&val->fsigrdataset, &val->fetch);
if (result != ISC_R_SUCCESS) {
dns_validator_detach(&val);
}
return (result);
}
/*%
@@ -1192,7 +1199,6 @@ seek_dnskey(dns_validator_t *val) {
dns_rdatatype_dnskey,
fetch_callback_dnskey, "seek_dnskey");
if (result != ISC_R_SUCCESS) {
dns_validator_detach(&val);
return (result);
}
return (DNS_R_WAIT);
@@ -1646,7 +1652,6 @@ get_dsset(dns_validator_t *val, dns_name_t *tname, isc_result_t *resp) {
fetch_callback_ds, "validate_dnskey");
*resp = DNS_R_WAIT;
if (result != ISC_R_SUCCESS) {
dns_validator_detach(&val);
*resp = result;
}
return (ISC_R_COMPLETE);
@@ -3004,12 +3009,18 @@ dns_validator_create(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type,
dns_validator_t **validatorp) {
isc_result_t result = ISC_R_FAILURE;
dns_validator_t *val = NULL;
dns_keytable_t *kt = NULL;
REQUIRE(name != NULL);
REQUIRE(rdataset != NULL ||
(rdataset == NULL && sigrdataset == NULL && message != NULL));
REQUIRE(validatorp != NULL && *validatorp == NULL);
result = dns_view_getsecroots(view, &kt);
if (result != ISC_R_SUCCESS) {
return (result);
}
val = isc_mem_get(view->mctx, sizeof(*val));
*val = (dns_validator_t){ .tid = isc_tid(),
.result = ISC_R_FAILURE,
@@ -3018,22 +3029,17 @@ dns_validator_create(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type,
.name = name,
.type = type,
.options = options,
.keytable = kt,
.link = ISC_LINK_INITIALIZER,
.loop = loop,
.cb = cb,
.arg = arg };
isc_refcount_init(&val->references, 1);
dns_view_attach(view, &val->view);
if (message != NULL) {
dns_message_attach(message, &val->message);
}
dns_view_attach(view, &val->view);
result = dns_view_getsecroots(val->view, &val->keytable);
if (result != ISC_R_SUCCESS) {
goto cleanup;
}
val->mustbesecure = dns_resolver_getmustbesecure(view->resolver, name);
dns_rdataset_init(&val->fdsset);
@@ -3052,15 +3058,6 @@ dns_validator_create(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type,
*validatorp = val;
return (ISC_R_SUCCESS);
cleanup:
if (val->message != NULL) {
dns_message_detach(&val->message);
}
isc_mem_put(view->mctx, val, sizeof(*val));
dns_view_detach(&view);
return (result);
}
void