Don't cleanup uninitialized dns_resolver buckets

If the isc_task_create_bound() fails in the middle of buckets
initialization - the most common case would be shutdown initialized
during reload, not all tasks would be initialized, but the cleanup
code would try to cleanup all buckets.

Make sure that we cleanup only the initialized buckets by setting
ntasks to the number of already initialized tasks on the error path.

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 1b6a8894e8c936ef375deed5a5bd378cb237d0dd..0c737e40f56e141947b1e71156bffa37a4262e5e 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -10378,7 +10378,7 @@ dns_resolver_create(dns_view_t *view, isc_taskmgr_t *taskmgr,
                                 .querydscp4 = -1,
                                 .querydscp6 = -1 };
 
-       atomic_init(&res->activebuckets, ntasks);
+       atomic_init(&res->activebuckets, res->nbuckets);
 
        isc_mem_attach(view->mctx, &res->mctx);
 
@@ -10399,12 +10399,12 @@ dns_resolver_create(dns_view_t *view, isc_taskmgr_t *taskmgr,
        }
 
        if (view->resstats != NULL) {
-               isc_stats_set(view->resstats, ntasks,
+               isc_stats_set(view->resstats, res->nbuckets,
                              dns_resstatscounter_buckets);
        }
 
        res->buckets = isc_mem_get(view->mctx,
-                                  ntasks * sizeof(res->buckets[0]));
+                                  res->nbuckets * sizeof(res->buckets[0]));
        for (uint32_t i = 0; i < ntasks; i++) {
                res->buckets[i] = (fctxbucket_t){ 0 };
 
@@ -10417,6 +10417,7 @@ dns_resolver_create(dns_view_t *view, isc_taskmgr_t *taskmgr,
                result = isc_task_create_bound(taskmgr, 0,
                                               &res->buckets[i].task, i);
                if (result != ISC_R_SUCCESS) {
+                       ntasks = i;
                        isc_mutex_destroy(&res->buckets[i].lock);
                        goto cleanup_buckets;
                }