4554. [bug] Remove double unlock in dns_dispatchmgr_setudp.

                        [RT #44336]

(cherry picked from commit 5dfa5221d54df64694cb7b2be537d3e30e20d569)

diff --git a/CHANGES b/CHANGES
index 7186d4ea707f3a1f7cfeca1e4a939e96f71bd0a4..419897c4e3fa494450003d9ec8a36c30e6adbd5d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4554.  [bug]           Remove double unlock in dns_dispatchmgr_setudp.
+                       [RT #44336]
+
 4553.  [bug]           Named could deadlock there were multiple changes to
                        NSEC/NSEC3 parameters for a zone being processed at
                        the same time. [RT #42770]

diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c
index d188bda46a724f57fa8365d1bdebc4660d9e9575..e2d98059a7edca34322c76b08ad835c121f2f210 100644 (file)
--- a/lib/dns/dispatch.c
+++ b/lib/dns/dispatch.c
@@ -2076,10 +2076,9 @@ dns_dispatchmgr_setudp(dns_dispatchmgr_t *mgr,
        }
        result = isc_mempool_create(mgr->mctx, sizeof(dispsocket_t),
                                    &mgr->spool);
-       if (result != ISC_R_SUCCESS) {
-               UNLOCK(&mgr->buffer_lock);
+       if (result != ISC_R_SUCCESS)
                goto cleanup;
-       }
+
        isc_mempool_setname(mgr->spool, "dispmgr_spool");
        isc_mempool_setmaxalloc(mgr->spool, maxrequests);
        isc_mempool_setfreemax(mgr->spool, maxrequests);