From: Ondřej Surý <ondrej@isc.org>
Date: Wed, 23 Feb 2022 21:04:05 +0000 (+0100)
Subject: Properly free up enqueued netievents in nm_destroy()
X-Git-Tag: v9.16.27~12^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af2bddc242ae963c89e2f06e5a2587479ceced99;p=thirdparty%2Fbind9.git

Properly free up enqueued netievents in nm_destroy()

When the isc_netmgr is being destroyed, the normal and priority queues
should be dequeued and netievents properly freed.  This wasn't the case.

(cherry picked from commit 88418c33729804cc86a9492e3e30f1123f56ddcd)
---

diff --git a/lib/isc/netmgr/netmgr.c b/lib/isc/netmgr/netmgr.c
index fb9d77d3b49..4bd45e7235c 100644
--- a/lib/isc/netmgr/netmgr.c
+++ b/lib/isc/netmgr/netmgr.c
@@ -403,14 +403,14 @@ nm_destroy(isc_nm_t **mgr0) {
 
 		/* Empty the async event queues */
 		while ((ievent = DEQUEUE_PRIORITY_NETIEVENT(worker)) != NULL) {
-			isc_mem_put(mgr->mctx, ievent, sizeof(*ievent));
+			isc__nm_put_netievent(mgr, ievent);
 		}
 
 		INSIST(DEQUEUE_PRIVILEGED_NETIEVENT(worker) == NULL);
 		INSIST(DEQUEUE_TASK_NETIEVENT(worker) == NULL);
 
-		while ((ievent = DEQUEUE_PRIORITY_NETIEVENT(worker)) != NULL) {
-			isc_mem_put(mgr->mctx, ievent, sizeof(*ievent));
+		while ((ievent = DEQUEUE_NORMAL_NETIEVENT(worker)) != NULL) {
+			isc__nm_put_netievent(mgr, ievent);
 		}
 		isc_condition_destroy(&worker->cond_prio);
 		isc_mutex_destroy(&worker->lock);