From: Artem Boldariev <artem@boldariev.com>
Date: Wed, 30 Nov 2022 20:58:13 +0000 (+0200)
Subject: TLS: Avoid accessing listener socket flags from other threads
X-Git-Tag: v9.19.8~24^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b5559cd8f41e67bf03e92d9d0338dee9d549b48;p=thirdparty%2Fbind9.git

TLS: Avoid accessing listener socket flags from other threads

This commit ensures that the flags inside a TLS listener socket
object (and associated worker) are accessed when accepting a
connection only from within the context of the dedicated thread, but
not other worker threads.
---

diff --git a/lib/isc/netmgr/tlsstream.c b/lib/isc/netmgr/tlsstream.c
index f8a0bc6dc2b..4a2497d5261 100644
--- a/lib/isc/netmgr/tlsstream.c
+++ b/lib/isc/netmgr/tlsstream.c
@@ -687,10 +687,9 @@ tlslisten_acceptcb(isc_nmhandle_t *handle, isc_result_t result, void *cbarg) {
 	REQUIRE(VALID_NMSOCK(tlslistensock));
 	REQUIRE(tlslistensock->type == isc_nm_tlslistener);
 
-	if (isc__nmsocket_closing(handle->sock) ||
-	    isc__nmsocket_closing(tlslistensock) ||
-	    !atomic_load(&tlslistensock->listening))
-	{
+	if (isc__nm_closing(handle->sock->worker)) {
+		return (ISC_R_SHUTTINGDOWN);
+	} else if (isc__nmsocket_closing(handle->sock)) {
 		return (ISC_R_CANCELED);
 	}