upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9.20] fix: dev: Prevent a reference leak when using plugins

Browse source 
The `NS_QUERY_DONE_BEGIN` and `NS_QUERY_DONE_SEND` plugin hooks could cause a reference leak if they returned `NS_HOOK_RETURN` without cleaning up the query context properly.

Closes #2094

Backport of MR !9971

Merge branch 'backport-2094-plugin-reference-leak-9.20' into 'bind-9.20'

See merge request isc-projects/bind9!10170
This commit is contained in:
Evan Hunt 2025-02-26 00:56:01 +00:00
commit 0201e3eacb
3 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/ns/include/ns/query.h
View file

@ -212,6 +212,7 @@ struct query_ctx {
ns_client_t *client; /* client object */
bool detach_client; /* client needs detaching */
bool async; /* asynchronous hook running */
dns_fetchresponse_t *fresp; /* recursion response */

21
lib/ns/query.c
View file

@ -5480,6 +5480,9 @@ qctx_clean(query_ctx_t *qctx) {
if (qctx->db != NULL && qctx->node != NULL) {
dns_db_detachnode(qctx->db, &qctx->node);
}
if (qctx->client != NULL && qctx->client->query.gluedb != NULL) {
dns_db_detach(&qctx->client->query.gluedb);
}
}
/*%
@ -6978,6 +6981,9 @@ ns_query_hookasync(query_ctx_t *qctx, ns_query_starthookasync_t runasync,
goto cleanup_and_detach_from_quota;
}
/* Record that an asynchronous copy of the qctx has been started */
qctx->async = true;
/*
* Typically the runasync() function will trigger recursion, but
* there is no need to set NS_QUERYATTR_RECURSING. The calling hook
@ -11678,10 +11684,6 @@ ns_query_done(query_ctx_t *qctx) {
qctx_clean(qctx);
qctx_freedata(qctx);
if (qctx->client->query.gluedb != NULL) {
dns_db_detach(&qctx->client->query.gluedb);
}
/*
* Clear the AA bit if we're not authoritative.
*/
@ -11820,6 +11822,17 @@ ns_query_done(query_ctx_t *qctx) {
return qctx->result;
cleanup:
/*
* We'd only get here if one of the hooks above
* (NS_QUERY_DONE_BEGIN or NS_QUERY_DONE_SEND) returned
* NS_HOOK_RETURN. Some housekeeping may be needed.
*/
qctx_clean(qctx);
qctx_freedata(qctx);
if (!qctx->async) {
qctx->detach_client = true;
query_error(qctx->client, DNS_R_SERVFAIL, __LINE__);
}
return result;
}

6
tests/ns/netmgr_wrap.c
View file

@ -97,3 +97,9 @@ isc_nmhandle_detach(isc_nmhandle_t **handlep) {
return;
}
void
ns_client_error(ns_client_t *client ISC_ATTR_UNUSED,
isc_result_t result ISC_ATTR_UNUSED) {
return;
}