From: Witold Kręcicki <wpk@isc.org>
Date: Sat, 7 Dec 2019 22:43:52 +0000 (+0100)
Subject: netmgr: Add more DbC checks for asynchronous calls.
X-Git-Tag: v9.15.7~20^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0779cc429a5c68364d31af1039bb2a6172babcd;p=thirdparty%2Fbind9.git

netmgr: Add more DbC checks for asynchronous calls.
---

diff --git a/lib/isc/netmgr/tcpdns.c b/lib/isc/netmgr/tcpdns.c
index 1dd19daf342..ad53aeface3 100644
--- a/lib/isc/netmgr/tcpdns.c
+++ b/lib/isc/netmgr/tcpdns.c
@@ -89,6 +89,7 @@ dnstcp_readtimeout(uv_timer_t *timer) {
 		(isc_nmsocket_t *) uv_handle_get_data((uv_handle_t *) timer);
 
 	REQUIRE(VALID_NMSOCK(sock));
+	REQUIRE(sock->tid == isc_nm_tid());
 
 	isc_nmsocket_detach(&sock->outer);
 	uv_close((uv_handle_t *) &sock->timer, timer_close_cb);
@@ -202,6 +203,7 @@ dnslisten_readcb(isc_nmhandle_t *handle, isc_region_t *region, void *arg) {
 
 	REQUIRE(VALID_NMSOCK(dnssock));
 	REQUIRE(VALID_NMHANDLE(handle));
+	REQUIRE(dnssock->tid == isc_nm_tid());
 
 	if (region == NULL) {
 		/* Connection closed */
@@ -490,6 +492,7 @@ isc__nm_tcpdns_send(isc_nmhandle_t *handle, isc_region_t *region,
 
 static void
 tcpdns_close_direct(isc_nmsocket_t *sock) {
+	REQUIRE(sock->tid == isc_nm_tid());
 	if (sock->outer != NULL) {
 		isc_nmsocket_detach(&sock->outer);
 	}