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

Don't use an uninitialized link on an error path

Browse Source 
Move the block on the error path, where the link is checked, to a place
where it makes sense, to avoid accessing an unitialized link when
jumping to the 'cleanup_query' label from 4 different places. The link
is initialized only after those jumps happen.

In addition, initilize the link when creating the object, to avoid
similar errors.
This commit is contained in:
Aram Sargsyan
2023-09-27 11:22:43 +00:00
parent 98cbf4ebfc
commit fb7bbbd1be
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/dns/resolver.c
View File

@@ -1991,9 +1991,12 @@ fctx_query(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo,
INSIST(ISC_LIST_EMPTY(fctx->validators)); INSIST(ISC_LIST_EMPTY(fctx->validators));
query = isc_mem_get(fctx->mctx, sizeof(*query)); query = isc_mem_get(fctx->mctx, sizeof(*query));
*query = (resquery_t){ .options = options, *query = (resquery_t){
.addrinfo = addrinfo, .options = options,
.dispatchmgr = res->view->dispatchmgr }; .addrinfo = addrinfo,
.dispatchmgr = res->view->dispatchmgr,
.link = ISC_LINK_INITIALIZER,
};
#if DNS_RESOLVER_TRACE #if DNS_RESOLVER_TRACE
fprintf(stderr, "rctx_init:%s:%s:%d:%p->references = 1\n", __func__, fprintf(stderr, "rctx_init:%s:%s:%d:%p->references = 1\n", __func__,
@@ -2141,7 +2144,6 @@ fctx_query(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo,
LOCK(&fctx->lock); LOCK(&fctx->lock);
INSIST(!SHUTTINGDOWN(fctx)); INSIST(!SHUTTINGDOWN(fctx));
fetchctx_attach(fctx, &query->fctx); fetchctx_attach(fctx, &query->fctx);
ISC_LINK_INIT(query, link);
query->magic = QUERY_MAGIC; query->magic = QUERY_MAGIC;
if ((query->options & DNS_FETCHOPT_TCP) == 0) { if ((query->options & DNS_FETCHOPT_TCP) == 0) {
@@ -2186,6 +2188,13 @@ cleanup_udpfetch:
} }
} }
LOCK(&fctx->lock);
if (ISC_LINK_LINKED(query, link)) {
atomic_fetch_sub_release(&fctx->nqueries, 1);
ISC_LIST_UNLINK(fctx->queries, query, link);
}
UNLOCK(&fctx->lock);
cleanup_dispatch: cleanup_dispatch:
fetchctx_detach(&query->fctx); fetchctx_detach(&query->fctx);
@@ -2194,13 +2203,6 @@ cleanup_dispatch:
} }
cleanup_query: cleanup_query:
LOCK(&fctx->lock);
if (ISC_LINK_LINKED(query, link)) {
atomic_fetch_sub_release(&fctx->nqueries, 1);
ISC_LIST_UNLINK(fctx->queries, query, link);
}
UNLOCK(&fctx->lock);
query->magic = 0; query->magic = 0;
dns_message_detach(&query->rmessage); dns_message_detach(&query->rmessage);
isc_mem_put(fctx->mctx, query, sizeof(*query)); isc_mem_put(fctx->mctx, query, sizeof(*query));