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

Adjust recursion quota when starting a fetch fails

Browse Source 
Some functions fail to detach from the recursion quota if an error
occurs while initiating recursion.  This causes the recursive client
counter to be off.  Add missing recursionquota_detach() calls, reworking
cleanup code where appropriate.
This commit is contained in:
Michał Kępień 2022-06-14 13:13:32 +02:00
parent 172e15f7ad
commit e09b36f2cc
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ns/query.c
View File

@ -2618,6 +2618,7 @@ fetch_and_forget(ns_client_t *client, dns_name_t *qname, dns_rdatatype_t qtype,
if (result != ISC_R_SUCCESS) {
ns_client_putrdataset(client, &tmprdataset);
isc_nmhandle_detach(handlep);
recursionquotatype_detach(client, recursion_type);
}
}
@ -6464,6 +6465,7 @@ ns_query_recurse(ns_client_t *client, dns_rdatatype_t qtype, dns_name_t *qname,
if (sigrdataset != NULL) {
ns_client_putrdataset(client, &sigrdataset);
}
recursionquotatype_detach(client, RECTYPE_NORMAL);
}
/*
@ -6833,7 +6835,7 @@ ns_query_hookasync(query_ctx_t *qctx, ns_query_starthookasync_t runasync,
client->manager->task, query_hookresume, client,
&client->query.hookactx);
if (result != ISC_R_SUCCESS) {
goto cleanup;
goto cleanup_and_detach_from_quota;
}
/*
@ -6850,6 +6852,8 @@ ns_query_hookasync(query_ctx_t *qctx, ns_query_starthookasync_t runasync,
isc_nmhandle_attach(client->handle, &HANDLE_RECTYPE_HOOK(client));
return (ISC_R_SUCCESS);
cleanup_and_detach_from_quota:
recursionquotatype_detach(client, RECTYPE_HOOK);
cleanup:
/*
* If we fail, send SERVFAIL now. It may be better to let the caller