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

Merge branch '3522-update-detach' into 'main'

Browse Source 
fix an incorrect detach in update processing

Closes #3522

See merge request isc-projects/bind9!6722
This commit is contained in:
Evan Hunt
2022-09-15 18:33:51 +00:00
parent 9f7a514e49 fdc35928eb
commit 94b32f2e0b
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
5973. [bug] Fixed a possible invalid detach in UPDATE
processing. [GL #3522]
5972. [bug] Gracefully handle when the statschannel HTTP connection 5972. [bug] Gracefully handle when the statschannel HTTP connection
gets cancelled during sending data back to the client. gets cancelled during sending data back to the client.
[GL #3542] [GL #3542]

25
lib/ns/update.c
View File

@@ -1663,19 +1663,17 @@ respond(ns_client_t *client, isc_result_t result) {
msg_result = dns_message_reply(client->message, true); msg_result = dns_message_reply(client->message, true);
if (msg_result != ISC_R_SUCCESS) { if (msg_result != ISC_R_SUCCESS) {
goto msg_failure; isc_log_write(ns_lctx, NS_LOGCATEGORY_UPDATE,
NS_LOGMODULE_UPDATE, ISC_LOG_ERROR,
"could not create update response message: %s",
isc_result_totext(msg_result));
ns_client_drop(client, msg_result);
isc_nmhandle_detach(&client->reqhandle);
return;
} }
client->message->rcode = dns_result_torcode(result); client->message->rcode = dns_result_torcode(result);
ns_client_send(client); ns_client_send(client);
return;
msg_failure:
isc_log_write(ns_lctx, NS_LOGCATEGORY_UPDATE, NS_LOGMODULE_UPDATE,
ISC_LOG_ERROR,
"could not create update response message: %s",
isc_result_totext(msg_result));
ns_client_drop(client, msg_result);
isc_nmhandle_detach(&client->reqhandle); isc_nmhandle_detach(&client->reqhandle);
} }
@@ -1689,7 +1687,8 @@ ns_update_start(ns_client_t *client, isc_nmhandle_t *handle,
dns_zone_t *zone = NULL, *raw = NULL; dns_zone_t *zone = NULL, *raw = NULL;
/* /*
* Attach to the request handle * Attach to the request handle. This will be held until
* we respond, or drop the request.
*/ */
isc_nmhandle_attach(handle, &client->reqhandle); isc_nmhandle_attach(handle, &client->reqhandle);
@@ -1771,8 +1770,6 @@ ns_update_start(ns_client_t *client, isc_nmhandle_t *handle,
default: default:
FAILC(DNS_R_NOTAUTH, "not authoritative for update zone"); FAILC(DNS_R_NOTAUTH, "not authoritative for update zone");
} }
isc_nmhandle_detach(&client->reqhandle);
return; return;
failure: failure:
@@ -1790,7 +1787,6 @@ failure:
if (zone != NULL) { if (zone != NULL) {
dns_zone_detach(&zone); dns_zone_detach(&zone);
} }
isc_nmhandle_detach(&client->reqhandle);
} }
/*% /*%
@@ -3704,6 +3700,7 @@ forward_done(isc_task_t *task, isc_event_t *event) {
ns_client_sendraw(client, uev->answer); ns_client_sendraw(client, uev->answer);
dns_message_detach(&uev->answer); dns_message_detach(&uev->answer);
isc_event_free(&event); isc_event_free(&event);
isc_nmhandle_detach(&client->reqhandle);
isc_nmhandle_detach(&client->updatehandle); isc_nmhandle_detach(&client->updatehandle);
} }